[FAB-13556] Update master for fabric v1.4.0

Change-Id: Iabb2cf024f9908cec60d7b30ecfd1d66699f97e5
Signed-off-by: David Enyeart <enyeart@us.ibm.com>

README.md

@@ -28,6 +28,7 @@ open source architecture; Hyperledger Fabric is your starting point.
 
 ## Releases
 
+- [v1.4.0 - January 9, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.0)
 - [v1.4.0-rc2 - December 20, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.4.0-rc2)
 - [v1.4.0-rc1 - December 10, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.4.0-rc1)
 - [v1.3.0 - October 10, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.3.0)

docs/source/install.rst

@@ -41,15 +41,15 @@ Fabric Samples and binaries, go ahead and execute the following command:
 
 .. code:: bash
 
-  curl -sSL http://bit.ly/2ysbOFE | bash -s 1.4.0-rc2
+  curl -sSL http://bit.ly/2ysbOFE | bash -s 1.4.0
 
 .. note:: If you want to download different versions for Fabric, Fabric-ca and thirdparty
           Docker images, you must pass the version identifier for each.
 
 .. code:: bash
 
   curl -sSL http://bit.ly/2ysbOFE | bash -s <fabric> <fabric-ca> <thirdparty>
-  curl -sSL http://bit.ly/2ysbOFE | bash -s 1.4.0-rc2 1.4.0-rc2 0.4.14
+  curl -sSL http://bit.ly/2ysbOFE | bash -s 1.4.0 1.4.0 0.4.14
 
 .. note:: If you get an error running the above curl command, you may
           have too old a version of curl that does not handle
@@ -62,7 +62,7 @@ Fabric Samples and binaries, go ahead and execute the following command:
 	  https://raw.githubusercontent.com/hyperledger/fabric/master/scripts/bootstrap.sh
 
 .. note:: You can use the command above for any published version of Hyperledger
-          Fabric. Simply replace `1.4.0-rc2` with the version identifier
+          Fabric. Simply replace `1.4.0` with the version identifier
           of the version you wish to install.
 
 The command above downloads and executes a bash script

release_notes/v1.4.0.txt

@@ -1,5 +1,5 @@
-v1.4.0-rc2 Release Notes - December 20, 2018
---------------------------------------------
+v1.4.0 Release Notes - January 9, 2019
+--------------------------------------
 
 What's New in Hyperledger Fabric v1.4
 -------------------------------------
@@ -122,4 +122,4 @@ Updated to Go version 1.11.1
 Updated baseimage version to 0.4.14
 
 For the full list of improvements and fixes, refer to the release change log:
-https://github.com/hyperledger/fabric/blob/master/CHANGELOG.md#v140-rc2
+https://github.com/hyperledger/fabric/blob/release-1.4/CHANGELOG.md#v140

scripts/bootstrap.sh

@@ -6,7 +6,7 @@
 #
 
 # if version not passed in, default to latest released version
-export VERSION=1.4.0-rc2
+export VERSION=1.4.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
@@ -23,8 +23,8 @@ printHelp() {
   echo "-s : bypass fabric-samples repo clone"
   echo "-b : bypass download of platform-specific binaries"
   echo
-  echo "e.g. bootstrap.sh 1.4.0-rc2 -s"
-  echo "would download docker images and binaries for version 1.4.0-rc2"
+  echo "e.g. bootstrap.sh 1.4.0 -s"
+  echo "would download docker images and binaries for version 1.4.0"
 }
 
 dockerFabricPull() {