From 4c444df7a63fbc5274de480a720ff795649c6d84 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Fri, 14 Oct 2016 14:20:33 -0700
Subject: [PATCH 1/3] Revert "version: bump to v3.1.0-rc.0"

This reverts commit cb178a78eabe9b3753c8c1f876d76d9989321594.
---
 version/version.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version/version.go b/version/version.go
index efc7682c6..7cbf3a1fc 100644
--- a/version/version.go
+++ b/version/version.go
@@ -24,7 +24,7 @@ import (
 var (
 	// MinClusterVersion is the min cluster version this etcd binary is compatible with.
 	MinClusterVersion = "3.0.0"
-	Version           = "v3.1.0-rc.0"
+	Version           = "3.1.0-alpha.1+git"
 
 	// Git SHA Value will be set during build
 	GitSHA = "Not provided (use ./build instead of go build)"

From 06fd31cde9a1c38c58eff85c19c6071c1789076a Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Fri, 14 Oct 2016 14:21:20 -0700
Subject: [PATCH 2/3] build: get GitSHA first

---
 build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build b/build
index b1fec53b0..4d2242eed 100755
--- a/build
+++ b/build
@@ -5,16 +5,16 @@ ORG_PATH="github.com/coreos"
 REPO_PATH="${ORG_PATH}/etcd"
 export GO15VENDOREXPERIMENT="1"
 
-# Set GO_LDFLAGS="" for building with all symbols for debugging.
-if [ -z "${GO_LDFLAGS+x}" ]; then GO_LDFLAGS="-s"; fi
-GO_LDFLAGS="$GO_LDFLAGS -X ${REPO_PATH}/cmd/vendor/${REPO_PATH}/version.GitSHA=${GIT_SHA}"
-
 eval $(go env)
 GIT_SHA=`git rev-parse --short HEAD || echo "GitNotFound"`
 if [ ! -z "$FAILPOINTS" ]; then
 	GIT_SHA="$GIT_SHA"-FAILPOINTS
 fi
 
+# Set GO_LDFLAGS="" for building with all symbols for debugging.
+if [ -z "${GO_LDFLAGS+x}" ]; then GO_LDFLAGS="-s"; fi
+GO_LDFLAGS="$GO_LDFLAGS -X ${REPO_PATH}/cmd/vendor/${REPO_PATH}/version.GitSHA=${GIT_SHA}"
+
 # enable/disable failpoints
 toggle_failpoints() {
 	FAILPKGS="etcdserver/ mvcc/backend/"

From a81997ac3f2503ed1c57a44af6164c6d38569669 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Fri, 14 Oct 2016 14:21:32 -0700
Subject: [PATCH 3/3] version: bump up to v3.1.0-rc.0

---
 version/version.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version/version.go b/version/version.go
index 7cbf3a1fc..04bb0fd69 100644
--- a/version/version.go
+++ b/version/version.go
@@ -24,7 +24,7 @@ import (
 var (
 	// MinClusterVersion is the min cluster version this etcd binary is compatible with.
 	MinClusterVersion = "3.0.0"
-	Version           = "3.1.0-alpha.1+git"
+	Version           = "3.1.0-rc.0"
 
 	// Git SHA Value will be set during build
 	GitSHA = "Not provided (use ./build instead of go build)"