From 89340fe69420ffc8fabb1a856c214303fb3c1a47 Mon Sep 17 00:00:00 2001
From: James Phillips <james@hashicorp.com>
Date: Mon, 26 Oct 2015 11:32:58 -0700
Subject: [PATCH 1/4] Removes the integration test runner, there weren't any
 tests using it.

---
 Makefile | 5 +----
 make.bat | 8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index c6b484a608..dfa1934178 100644
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,6 @@ test: deps
 	@./scripts/test.sh
 	@$(MAKE) vet
 
-integ:
-	go list ./... | INTEG_TESTS=yes xargs -n1 go test
-
 cover: deps
 	./scripts/verify_no_uuid.sh
 	go list ./... | xargs -n1 go test --cover
@@ -76,4 +73,4 @@ web:
 web-push:
 	./scripts/website_push.sh
 
-.PHONY: all bin dev dist cov deps integ test vet web web-push generate test-nodep
+.PHONY: all bin dev dist cov deps test vet web web-push generate test-nodep
diff --git a/make.bat b/make.bat
index 659560e735..a1360b025e 100644
--- a/make.bat
+++ b/make.bat
@@ -23,10 +23,10 @@ if x%1==xdeps goto end
 goto args
 
 :args
-for %%a in (all,cover,integ,test,vet,updatedeps) do (if x%1==x%%a goto %%a)
+for %%a in (all,cover,test,vet,updatedeps) do (if x%1==x%%a goto %%a)
 echo.
 echo Unknown make target: %1
-echo Expected one of "all", "cover", "deps", "integ", "test", "vet", or "updatedeps".
+echo Expected one of "all", "cover", "deps", "test", "vet", or "updatedeps".
 set _EXITCODE=1
 goto end
 
@@ -45,10 +45,6 @@ go tool cover 2>NUL
 if %ERRORLEVEL% EQU 3 go get golang.org/x/tools/cmd/cover
 goto test
 
-:integ
-set INTEG_TESTS=yes
-goto test
-
 :test
 call .\scripts\windows\verify_no_uuid.bat %CD%
 if %ERRORLEVEL% EQU 0 goto _test

From 8738f9780bd30f628508d4e721df0d77ad0bd3b7 Mon Sep 17 00:00:00 2001
From: James Phillips <james@hashicorp.com>
Date: Mon, 26 Oct 2015 15:59:38 -0700
Subject: [PATCH 2/4] Updates go version to 1.5.1, and modernizes the
 Vagrantfile.

Drops 32bit in the Vagrantfile as well since we can build that with
gox and don't need a special environment for it. The Vagrantfile is
now just a good default development environment.
---
 README.md   |  4 ++--
 Vagrantfile | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 51283a1fbc..4cb53a6dc5 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ http://www.consul.io/docs
 ## Developing Consul
 
 If you wish to work on Consul itself, you'll first need [Go](https://golang.org)
-installed (version 1.4+ is _required_). Make sure you have Go properly installed,
+installed (version 1.5.1+ is _required_). Make sure you have Go properly installed,
 including setting up your [GOPATH](https://golang.org/doc/code.html#GOPATH).
 
 Next, clone this repository into `$GOPATH/src/github.com/hashicorp/consul` and
@@ -66,7 +66,7 @@ format the code according to Go standards.
 
 ### Building Consul on Windows
 
-Make sure Go 1.4+ is installed on your system and that the Go command is in your
+Make sure Go 1.5.1+ is installed on your system and that the Go command is in your
 %PATH%.
 
 For building Consul on Windows, you also need to have MinGW installed.
diff --git a/Vagrantfile b/Vagrantfile
index f21de15fe6..d364d6b97e 100755
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,6 +5,7 @@
 VAGRANTFILE_API_VERSION = '2'
 
 @script = <<SCRIPT
+GOVERSION="1.5.1"
 SRCROOT="/opt/go"
 SRCPATH="/opt/gopath"
 
@@ -17,8 +18,8 @@ sudo apt-get install -y build-essential git-core
 
 # Install Go
 cd /tmp
-wget --quiet --no-check-certificate https://storage.googleapis.com/golang/go1.4.2.linux-${ARCH}.tar.gz
-tar -xvf go1.4.2.linux-${ARCH}.tar.gz
+wget --quiet --no-check-certificate https://storage.googleapis.com/golang/go${GOVERSION}.linux-${ARCH}.tar.gz
+tar -xvf go${GOVERSION}.linux-${ARCH}.tar.gz
 sudo mv go $SRCROOT
 sudo chmod 775 $SRCROOT
 sudo chown vagrant:vagrant $SRCROOT
@@ -56,14 +57,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  # Note we use older boxes here to avoid glibc version check problems with
-  # the built C dependencies.
   config.vm.define '64bit' do |n1|
-    n1.vm.box = 'chef/ubuntu-10.04'
-  end
-
-  config.vm.define '32bit' do |n2|
-    n2.vm.box = 'chef/ubuntu-10.04-i386'
+    n1.vm.box = 'hashicorp/precise64'
   end
 
   config.push.define "www", strategy: "local-exec" do |push|

From 7db346886528fe463cf9bbfd2f6f70acc17666d3 Mon Sep 17 00:00:00 2001
From: James Phillips <james@hashicorp.com>
Date: Mon, 26 Oct 2015 16:00:51 -0700
Subject: [PATCH 3/4] Makes the Makefile pull the tools it needs on the first
 run.

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dfa1934178..6782e70cae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+GOTOOLS = github.com/mitchellh/gox golang.org/x/tools/cmd/stringer
 DEPS = $(shell go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
 PACKAGES = $(shell go list ./...)
 VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
@@ -26,11 +27,11 @@ cov:
 
 deps:
 	@echo "--> Installing build dependencies"
+	@go get -v $(GOTOOLS)
 	@go get -d -v ./... $(DEPS)
 
 updatedeps: deps
-	go get -u github.com/mitchellh/gox
-	go get -u golang.org/x/tools/cmd/stringer
+	go get -u -v $(GOTOOLS)
 	go list ./... \
 		| xargs go list -f '{{join .Deps "\n"}}' \
 		| grep -v github.com/hashicorp/consul \

From 52465a5081b9dda93f5353562a918a7282c205e3 Mon Sep 17 00:00:00 2001
From: James Phillips <james@hashicorp.com>
Date: Mon, 26 Oct 2015 16:03:14 -0700
Subject: [PATCH 4/4] Preps the version for the first RC.

---
 version.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.go b/version.go
index 0a68f59a36..f7aa280c84 100644
--- a/version.go
+++ b/version.go
@@ -7,9 +7,9 @@ var (
 )
 
 // The main version number that is being run at the moment.
-const Version = "0.5.2"
+const Version = "0.6.0"
 
 // 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 = "rc1"