From ce92cc3dc5adddcf8bc49d43b70f273f9b4340bb Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Mon, 2 Jun 2014 14:17:38 -0700
Subject: [PATCH] feat(CHANGELOG): bump to v0.4.2

---
 CHANGELOG                 | 5 +++++
 README.md                 | 2 +-
 server/release_version.go | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ae605ee3f..099e1f07f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v0.4.2
+* Improvements to the clustering documents
+* Set content-type properly on errors (#469)
+* Standbys re-join if they should be part of the cluster (#810, #815, #818)
+
 v0.4.1
 * Re-introduce DELETE on the machines endpoint
 * Document the machines endpoint
diff --git a/README.md b/README.md
index e3d20773d..779cdc9f3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # etcd
 
-README version 0.4.1
+README version 0.4.2
 
 A highly-available key value store for shared configuration and service discovery.
 etcd is inspired by [Apache ZooKeeper][zookeeper] and [doozer][doozer], with a focus on being:
diff --git a/server/release_version.go b/server/release_version.go
index 1bfe3c5e7..0f2a8c48b 100644
--- a/server/release_version.go
+++ b/server/release_version.go
@@ -1,3 +1,3 @@
 package server
 
-const ReleaseVersion = "0.4.1+git"
+const ReleaseVersion = "0.4.2"