From 6c2ee5c8427312cd0cb0325083548bf6de0cca46 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Mon, 21 Jul 2014 10:58:37 -0400
Subject: [PATCH] Cutting v0.3.1

---
 CHANGELOG.md                     | 11 ++++++++++-
 bench/bench-aws.json             |  4 ++--
 bench/bench.json                 |  4 ++--
 demo/vagrant-cluster/Vagrantfile |  2 +-
 version.go                       |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b6834119c..c2954ce23b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,23 @@
-## 0.3.1 (Unreleased)
+## 0.3.1 (July 21, 2014)
+
+FEATURES:
+
+  * Improved bootstrapping process, thanks to @robxu9
 
 BUG FIXES:
 
   * Fixed issue with service re-registration [GH-216]
   * Fixed handling of `-rejoin` flag
+  * Restored 0.2 TLS behavior, thanks to @nelhage [GH-233]
+  * Fix the statsite flags, thanks to @nelhage [GH-243]
+  * Fixed filters on criticial / non-passing checks [GH-241]
 
 IMPROVEMENTS:
 
+  * UI Improvements
   * Improved handling of Serf snapshot data
   * Increase reliability of failure detector
+  * More useful logging messages
 
 
 ## 0.3.0 (June 13, 2014)
diff --git a/bench/bench-aws.json b/bench/bench-aws.json
index 2adb91ccda..0cd03a14e0 100644
--- a/bench/bench-aws.json
+++ b/bench/bench-aws.json
@@ -53,8 +53,8 @@
             "sudo mkdir /etc/consul.d",
             "sudo apt-get update",
             "sudo apt-get install unzip make",
-            "wget https://dl.bintray.com/mitchellh/consul/0.3.0_linux_amd64.zip",
-            "unzip 0.3.0_linux_amd64.zip",
+            "wget https://dl.bintray.com/mitchellh/consul/0.3.1_linux_amd64.zip",
+            "unzip 0.3.1_linux_amd64.zip",
             "sudo mv consul /usr/local/bin/consul",
             "chmod +x /usr/local/bin/consul"
         ]
diff --git a/bench/bench.json b/bench/bench.json
index c8b2910558..67603072f7 100644
--- a/bench/bench.json
+++ b/bench/bench.json
@@ -47,8 +47,8 @@
             "mkdir /etc/consul.d",
             "apt-get update",
             "apt-get install unzip make",
-            "wget https://dl.bintray.com/mitchellh/consul/0.3.0_linux_amd64.zip",
-            "unzip 0.3.0_linux_amd64.zip",
+            "wget https://dl.bintray.com/mitchellh/consul/0.3.1_linux_amd64.zip",
+            "unzip 0.3.1_linux_amd64.zip",
             "mv consul /usr/local/bin/consul",
             "chmod +x /usr/local/bin/consul"
         ]
diff --git a/demo/vagrant-cluster/Vagrantfile b/demo/vagrant-cluster/Vagrantfile
index 5678c544ff..427f06e2e4 100644
--- a/demo/vagrant-cluster/Vagrantfile
+++ b/demo/vagrant-cluster/Vagrantfile
@@ -7,7 +7,7 @@ sudo apt-get install -y unzip
 
 echo Fetching Consul...
 cd /tmp/
-wget https://dl.bintray.com/mitchellh/consul/0.3.0_linux_amd64.zip -O consul.zip
+wget https://dl.bintray.com/mitchellh/consul/0.3.1_linux_amd64.zip -O consul.zip
 
 echo Installing Consul...
 unzip consul.zip
diff --git a/version.go b/version.go
index 38fc1914e9..a38a77a3f8 100644
--- a/version.go
+++ b/version.go
@@ -4,7 +4,7 @@ package main
 var GitCommit string
 
 // The main version number that is being run at the moment.
-const Version = "0.3.0"
+const Version = "0.3.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