Merge "Prepare release-1.2 branch for 1.2.1 development" into release…

…-1.2
hyperledger · Jul 3, 2018 · 3bcdbb2 · 3bcdbb2
2 parents df58083 + 2c97914
commit 3bcdbb2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -29,9 +29,9 @@
 #   - clean-all - cleans the build area and release packages
 
 PROJECT_NAME = fabric-ca
-BASE_VERSION = 1.2.0
-PREV_VERSION = 1.2.0-rc1
-IS_RELEASE = true
+BASE_VERSION = 1.2.1
+PREV_VERSION = 1.2.0
+IS_RELEASE = false
 
 ARCH=$(shell go env GOARCH)
 MARCH=$(shell go env GOOS)-$(shell go env GOARCH)