From 6fef31442383d7b2a36a66b77156987c6f15df7c Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Fri, 5 Aug 2016 19:15:14 -0400
Subject: [PATCH] version bump and release branch

---
 consensus/version.go | 2 +-
 test/run_test.sh     | 2 +-
 test/test.sh         | 2 +-
 version/version.go   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/consensus/version.go b/consensus/version.go
index 2acc3b77..34886db3 100644
--- a/consensus/version.go
+++ b/consensus/version.go
@@ -8,6 +8,6 @@ import (
 var Spec = "1"     // async
 var Major = "0"    //
 var Minor = "2"    // replay refactor
-var Revision = "1" // round state fix
+var Revision = "2" // validation -> commit
 
 var Version = Fmt("v%s/%s.%s.%s", Spec, Major, Minor, Revision)
diff --git a/test/run_test.sh b/test/run_test.sh
index 188c94f5..90e8f502 100644
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -12,7 +12,7 @@ make test_race
 # run the app tests
 bash test/app/test.sh
 
-if [[ "$BRANCH" == "master" || "$BRANCH" == "staging" ]]; then
+if [[ "$BRANCH" == "master" || $(echo "$BRANCH" | grep "release-") != "" ]]; then
 	echo ""
 	echo "* branch $BRANCH; testing libs"
 	# checkout every github.com/tendermint dir and run its tests
diff --git a/test/test.sh b/test/test.sh
index 99e1fcdf..fe1c6206 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -23,7 +23,7 @@ echo "* running basic peer tests"
 bash test/p2p/test.sh tester
 
 BRANCH=`git rev-parse --abbrev-ref HEAD`
-if [[ "$BRANCH" == "master" || "$BRANCH" == "staging" ]]; then
+if [[ "$BRANCH" == "master" || $(echo "$BRANCH" | grep "release-") != "" ]]; then
 	echo ""
 	echo "* branch $BRANCH; running mintnet/netmon throughput benchmark"
 	bash tests/net/test.sh
diff --git a/version/version.go b/version/version.go
index eccabb79..e275ce5b 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 const Maj = "0"
-const Min = "6" // tmsp refactor
+const Min = "7" // tmsp useability (protobuf, unix); optimizations; broadcast_tx_commit
 const Fix = "0"
 
 const Version = Maj + "." + Min + "." + Fix