From 6935a856c51e397b3e2dca0d8ca44bac0adf09b0 Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Wed, 1 Feb 2017 15:09:49 -0800
Subject: [PATCH] Prep for 0.5.5 and add changelog entry for #2266

---
 CHANGELOG.md | 5 +++++
 version.go   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb289018e..0e4bfdd64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.5 (Unreleased)
+
+BUG FIXES:
+  * server: Fix panic on upgrade to 0.5.3 or 0.5.4 [GH-2266]
+
 ## 0.5.4 (January 31, 2017)
 
 IMPROVEMENTS:
diff --git a/version.go b/version.go
index 60a459bc5..4fa66a77f 100644
--- a/version.go
+++ b/version.go
@@ -10,4 +10,4 @@ const Version = "0.5.4"
 // A pre-release marker for the version. If this is "" (empty string)
 // then it means that it is a final release. Otherwise, this is a pre-release
 // such as "dev" (in development), "beta", "rc1", etc.
-const VersionPrerelease = ""
+const VersionPrerelease = "de"