From b0de16e7e8dc80d861c2edfcc52baa6c10336903 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Wed, 15 Oct 2014 17:35:28 -0700
Subject: [PATCH] CHANGELOG updates

---
 CHANGELOG.md | 33 +++++++++++++++++++++++++++++++--
 version.go   |  4 ++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a7fea8724..3b0b92270c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,42 @@
 ## 0.4.1 (Unreleased)
 
+FEATURES:
+
+ * Adding flags for `-retry-join` to attempt a join with
+   configurable retry behavior. [GH-395]
+
 BUG FIXES:
 
+ * Fixed ACL token in UI
+ * Fixed ACL reloading in UI [GH-323]
+ * Fixed long session names in UI [GH-353]
+ * Fixed exit code from remote exec [GH-346]
  * Fixing only a single watch being run by an agent [GH-337]
  * Fixing potential race in connection multiplexing
- * Fixing issue with Session ID and ACL ID generation. Previously,
-   sessions and tokens could be invalidated when the leader changed.
+ * Fixing issue with Session ID and ACL ID generation. [GH-391]
  * Fixing multiple headers for /v1/event/list endpoint [GH-361]
  * Fixing graceful leave of leader causing invalid Raft peers [GH-360]
+ * Fixing bug with closing TLS connction on error
+ * Fixing issue with node reaping [GH-371]
+ * Fixing aggressive deadlock time [GH-389]
+ * Fixing syslog filter level [GH-272]
+ * Serf snapshot compaction works on Windows [GH-332]
+ * Raft snapshots work on Windows [GH-265]
+ * Consul service entry clean by clients now possible
+
+ IMPROVEMENTS:
+
+ * Use "critical" health state instead of "unknown" [GH-341]
+ * Consul service can be targed for exec [GH-344]
+ * Provide debug logging for session invalidation [GH-390]
+ * Added "Deregister" button to UI [GH-364]
+ * Added `enable_truncate` DNS configuration flag [GH-376]
+ * Reduce mmap() size on 32bit systems [GH-265]
+ * Temporary state is cleaned after an abort [GH-338] [GH-178]
+
+MISC:
+
+ * Health state "unknown" being deprecated
 
 ## 0.4.0 (September 5, 2014)
 
diff --git a/version.go b/version.go
index bcabe0a71f..6b1d307165 100644
--- a/version.go
+++ b/version.go
@@ -4,9 +4,9 @@ package main
 var GitCommit string
 
 // The main version number that is being run at the moment.
-const Version = "0.4.0"
+const Version = "0.4.1"
 
 // 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 = "rc"