Release fabric v1.4.6

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
hyperledger · Feb 25, 2020 · af2b462 · af2b462
1 parent 87df051
commit af2b462
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## v1.4.6
+Tue Feb 25 12:48:07 EST 2020
+
+* [ac6305e](https://github.com/hyperledger/fabric/commit/ac6305e) [FAB-17523](https://jira.hyperledger.org/browse/FAB-17523) Endorsing peer was not honoring RequiredPeerCount (#716) (#733)
+* [0c421c8](https://github.com/hyperledger/fabric/commit/0c421c8) Fix nil dereference in etcdraft config parsing (#724)
+* [9072299](https://github.com/hyperledger/fabric/commit/9072299) Add ending braces to ReadWrite set.
+* [a0b7584](https://github.com/hyperledger/fabric/commit/a0b7584) Optimize inquire.IsSubset (#713)
+* [60c8ab9](https://github.com/hyperledger/fabric/commit/60c8ab9) Prepare for next fabric rel v1.4.6
+
 ## v1.4.5
 Wed Feb 19 12:32:43 EST 2020
 

diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ open source architecture; Hyperledger Fabric is your starting point.
 
 ## Releases
 
+- [v1.4.6 - February 25, 2020](https://github.com/hyperledger/fabric/releases/tag/v1.4.6)
 - [v1.4.5 - February 19, 2020](https://github.com/hyperledger/fabric/releases/tag/v1.4.5)
 - [v1.4.4 - November 14, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.4)
 - [v1.4.3 - August 26, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.3)

diff --git a/docs/source/install.rst b/docs/source/install.rst
@@ -48,12 +48,12 @@ the binaries and images.
 
 .. note:: If you want a specific release, pass a version identifier for Fabric,
           Fabric-ca and thirdparty Docker images.
-          The command below demonstrates how to download **Fabric v1.4.5**
+          The command below demonstrates how to download **Fabric v1.4.6**
 
 .. code:: bash
 
   curl -sSL http://bit.ly/2ysbOFE | bash -s -- <fabric_version> <fabric-ca_version> <thirdparty_version>
-  curl -sSL http://bit.ly/2ysbOFE | bash -s -- 1.4.5 1.4.5 0.4.18
+  curl -sSL http://bit.ly/2ysbOFE | bash -s -- 1.4.6 1.4.6 0.4.18
 
 .. note:: If you get an error running the above curl command, you may
           have too old a version of curl that does not handle

diff --git a/docs/source/whatsnew.rst b/docs/source/whatsnew.rst
@@ -179,12 +179,14 @@ with a link to the full release change log.
 * `Fabric v1.4.3 release notes <https://github.com/hyperledger/fabric/releases/tag/v1.4.3>`_.
 * `Fabric v1.4.4 release notes <https://github.com/hyperledger/fabric/releases/tag/v1.4.4>`_.
 * `Fabric v1.4.5 release notes <https://github.com/hyperledger/fabric/releases/tag/v1.4.5>`_.
+* `Fabric v1.4.6 release notes <https://github.com/hyperledger/fabric/releases/tag/v1.4.6>`_.
 * `Fabric CA v1.4.0 release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.0>`_.
 * `Fabric CA v1.4.1 release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.1>`_.
 * `Fabric CA v1.4.2 release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.2>`_.
 * `Fabric CA v1.4.3 release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.3>`_.
 * `Fabric CA v1.4.4 release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.4>`_.
 * `Fabric CA v1.4.5 release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.5>`_.
+* `Fabric CA v1.4.6 release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.6>`_.
 
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -6,9 +6,9 @@
 #
 
 # if version not passed in, default to latest released version
-export VERSION=1.4.5
+export VERSION=1.4.6
 # if ca version not passed in, default to latest released version
-export CA_VERSION=1.4.5
+export CA_VERSION=1.4.6
 # current version of thirdparty images (couchdb, kafka and zookeeper) released
 export THIRDPARTY_IMAGE_VERSION=0.4.18
 export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')")
@@ -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.5 -s"
-  echo "would download docker images and binaries for version 1.4.5"
+  echo "e.g. bootstrap.sh 1.4.6 -s"
+  echo "would download docker images and binaries for version 1.4.6"
 }
 
 dockerFabricPull() {