Merge branch 'rc7release'

tsuru · Feb 6, 2017 · b80b5c0 · b80b5c0
2 parents 57ec155 + 08dc328
commit b80b5c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/server.go b/api/server.go
@@ -36,7 +36,7 @@ import (
 	"gopkg.in/tylerb/graceful.v1"
 )
 
-const Version = "1.2.0-rc6"
+const Version = "1.2.0-rc7"
 
 type TsuruHandler struct {
 	method string

diff --git a/docs/conf.py b/docs/conf.py
@@ -53,7 +53,7 @@
 version = '1.2'
 
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0-rc6'
+release = '1.2.0-rc7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.