Merge "[FAB-11062] Update README and bootstrap.sh for 1.2.0"

README.md

@@ -28,6 +28,7 @@ open source architecture; Hyperledger Fabric is your starting point.
 
 ## Releases
 
+- [v1.2.0 - July 3, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.2.0)
 - [v1.2.0-rc1 - June 22, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.2.0-rc1)
 - [v1.1.0 - March 15, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.1.0)
 - [v1.1.0-rc1 - March 1, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.1.0-rc1)

scripts/bootstrap.sh

@@ -6,11 +6,11 @@
 #
 
 # if version not passed in, default to latest released version
-export VERSION=1.2.0-rc1
+export VERSION=1.2.0
 # if ca version not passed in, default to latest released version
 export CA_VERSION=$VERSION
 # current version of thirdparty images (couchdb, kafka and zookeeper) released
-export THIRDPARTY_IMAGE_VERSION=0.4.8
+export THIRDPARTY_IMAGE_VERSION=0.4.10
 export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')")
 export MARCH=$(uname -m)
 
@@ -21,8 +21,8 @@ printHelp() {
   echo "-s - bypass fabric-samples repo clone"
   echo "-b - bypass download of platform-specific binaries"
   echo
-  echo "e.g. bootstrap.sh 1.1.1 -s"
-  echo "would download docker images and binaries for version 1.1.1"
+  echo "e.g. bootstrap.sh 1.2.0 -s"
+  echo "would download docker images and binaries for version 1.2.0"
 }
 
 dockerFabricPull() {