[FAB-13390] Release fabric v1.4.0-rc2

Change-Id: Icaa3581fd491874ac85c960280ed10ab676b6c82 Signed-off-by: David Enyeart <[email protected]>
hyperledger · Dec 20, 2018 · b87ec80 · b87ec80
1 parent f87c3f9
commit b87ec80
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,40 @@
+## v1.4.0-rc2
+Thu Dec 20 08:36:43 EST 2018
+
+* [47317b2](https://github.com/hyperledger/fabric/commit/47317b2) recon: add debug logs in ledger
+* [5c54bf2](https://github.com/hyperledger/fabric/commit/5c54bf2) opt: lscc state cache in couchDB
+* [ecb8e48](https://github.com/hyperledger/fabric/commit/ecb8e48) [FAB-13271](https://jira.hyperledger.org/browse/FAB-13271) Commercial Paper Updates
+* [85802b9](https://github.com/hyperledger/fabric/commit/85802b9) [FAB-12978](https://jira.hyperledger.org/browse/FAB-12978) Develop Apps: Connection options topic
+* [e9e5ca6](https://github.com/hyperledger/fabric/commit/e9e5ca6) [FAB-13025](https://jira.hyperledger.org/browse/FAB-13025) generate rst metric tables
+* [f91e87c](https://github.com/hyperledger/fabric/commit/f91e87c) Add meter with fabric and go version
+* [863f989](https://github.com/hyperledger/fabric/commit/863f989) recon: at a time, only 1 func. can use the Cache
+* [283bb61](https://github.com/hyperledger/fabric/commit/283bb61) [FAB-12934](https://jira.hyperledger.org/browse/FAB-12934) Develop Apps: Connection profile topic
+* [728f4eb](https://github.com/hyperledger/fabric/commit/728f4eb) [FAB-13327](https://jira.hyperledger.org/browse/FAB-13327) Architecture Explained clarification
+* [df845e0](https://github.com/hyperledger/fabric/commit/df845e0) [FAB-13340](https://jira.hyperledger.org/browse/FAB-13340) Fix reconciliation CouchDB bulk load
+* [cfdb44d](https://github.com/hyperledger/fabric/commit/cfdb44d) [FAB-13303](https://jira.hyperledger.org/browse/FAB-13303) increase reconciliation test coverage
+* [44325b4](https://github.com/hyperledger/fabric/commit/44325b4) [FAB-13302](https://jira.hyperledger.org/browse/FAB-13302) check for err before report mismatches
+* [1954f36](https://github.com/hyperledger/fabric/commit/1954f36) [FAB-13301](https://jira.hyperledger.org/browse/FAB-13301) use generated mocks in pvt data tests
+* [e5b3481](https://github.com/hyperledger/fabric/commit/e5b3481) [FAB-13283](https://jira.hyperledger.org/browse/FAB-13283) Update commercial paper tutorial
+* [fb7ed54](https://github.com/hyperledger/fabric/commit/fb7ed54) [FAB-13292](https://jira.hyperledger.org/browse/FAB-13292) fix version check in bootstrap.sh
+* [158392d](https://github.com/hyperledger/fabric/commit/158392d) [FAB-13282](https://jira.hyperledger.org/browse/FAB-13282) Clarify version of node.js
+* [ba37eff](https://github.com/hyperledger/fabric/commit/ba37eff) [FAB-13269](https://jira.hyperledger.org/browse/FAB-13269) keep reconcile pvt in one pass
+* [3bcdac5](https://github.com/hyperledger/fabric/commit/3bcdac5) [FAB-13288](https://jira.hyperledger.org/browse/FAB-13288) BYFN manual step fixes
+* [02af194](https://github.com/hyperledger/fabric/commit/02af194) [FAB-13277](https://jira.hyperledger.org/browse/FAB-13277) Fix typos in doc
+* [afb2e8d](https://github.com/hyperledger/fabric/commit/afb2e8d) [FAB-11734](https://jira.hyperledger.org/browse/FAB-11734) BYFN endorsement policy
+* [da5de24](https://github.com/hyperledger/fabric/commit/da5de24) [FAB-13224](https://jira.hyperledger.org/browse/FAB-13224) fix blocksprovider unit test flakes
+* [2cda36c](https://github.com/hyperledger/fabric/commit/2cda36c) [FAB-13270](https://jira.hyperledger.org/browse/FAB-13270) fix mkdir cmd
+* [c10e00c](https://github.com/hyperledger/fabric/commit/c10e00c) [FAB-13256](https://jira.hyperledger.org/browse/FAB-13256) Fix What's New link to release notes
+* [c5abc91](https://github.com/hyperledger/fabric/commit/c5abc91) [FAB-13253](https://jira.hyperledger.org/browse/FAB-13253) Improve SDK compatibility doc
+* [a00a80b](https://github.com/hyperledger/fabric/commit/a00a80b) [FAB-13251](https://jira.hyperledger.org/browse/FAB-13251) Add nil check in ToGossipMessage
+* [ccf843c](https://github.com/hyperledger/fabric/commit/ccf843c) [FAB-11608](https://jira.hyperledger.org/browse/FAB-11608) Gossip: Optimize alive message verification
+* [3cbc5cf](https://github.com/hyperledger/fabric/commit/3cbc5cf) Remove +lifecycle enable parameter from core.yaml
+* [0b7aefd](https://github.com/hyperledger/fabric/commit/0b7aefd) [FAB-13239](https://jira.hyperledger.org/browse/FAB-13239) terminate container streaming output loop
+* [05d99ad](https://github.com/hyperledger/fabric/commit/05d99ad) regenerate ledger testdata using release-1.1
+* [e485f77](https://github.com/hyperledger/fabric/commit/e485f77) Fix bug in decoding missingdatakey
+* [5bcbbb5](https://github.com/hyperledger/fabric/commit/5bcbbb5) [FAB-13024](https://jira.hyperledger.org/browse/FAB-13024) Update fabcar doc
+* [0b07d53](https://github.com/hyperledger/fabric/commit/0b07d53) [FAB-12870](https://jira.hyperledger.org/browse/FAB-12870) fix timing flake in grpclogging tests
+* [11fa186](https://github.com/hyperledger/fabric/commit/11fa186) [FAB-13114](https://jira.hyperledger.org/browse/FAB-13114) Prepare for next rel (1.4.0 on release-1.4)
+
 ## v1.4.0-rc1
 Mon Dec 10 13:09:08 EST 2018
 

diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@
 #   - docker-tag-stable - re-tags the images made by 'make docker' with the :stable tag
 #   - help-docs - generate the command reference docs
 
-BASE_VERSION = 1.4.0
+BASE_VERSION = 1.4.0-rc2
 PREV_VERSION = 1.4.0-rc1
 CHAINTOOL_RELEASE=1.1.3
 BASEIMAGE_RELEASE=0.4.14

diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ open source architecture; Hyperledger Fabric is your starting point.
 
 ## Releases
 
+- [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)
 - [v1.3.0-rc1 - September 24, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.3.0-rc1)

diff --git a/docs/source/install.rst b/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-rc1
+  curl -sSL http://bit.ly/2ysbOFE | bash -s 1.4.0-rc2
 
 .. 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-rc1 1.4.0-rc1 0.4.14
+  curl -sSL http://bit.ly/2ysbOFE | bash -s 1.4.0-rc2 1.4.0-rc2 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-rc1` with the version identifier
+          Fabric. Simply replace `1.4.0-rc2` with the version identifier
           of the version you wish to install.
 
 The command above downloads and executes a bash script

diff --git a/docs/source/whatsnew.rst b/docs/source/whatsnew.rst
@@ -117,8 +117,8 @@ Release notes
 The release notes provide more details for users moving to the new release, along
 with a link to the full release change log.
 
-* `Fabric release notes <https://github.com/hyperledger/fabric/releases/tag/v1.4.0-rc1>`_.
-* `Fabric CA release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.0-rc1>`_.
+* `Fabric release notes <https://github.com/hyperledger/fabric/releases/tag/v1.4.0-rc2>`_.
+* `Fabric CA release notes <https://github.com/hyperledger/fabric-ca/releases/tag/v1.4.0-rc2>`_.
 
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/
diff --git a/release_notes/v1.4.0.txt b/release_notes/v1.4.0.txt
@@ -1,4 +1,4 @@
-v1.4.0-rc1 Release Notes - December 10, 2018
+v1.4.0-rc2 Release Notes - December 20, 2018
 --------------------------------------------
 
 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-rc1
+https://github.com/hyperledger/fabric/blob/master/CHANGELOG.md#v140-rc2
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -6,7 +6,7 @@
 #
 
 # if version not passed in, default to latest released version
-export VERSION=1.4.0-rc1
+export VERSION=1.4.0-rc2
 # 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-rc1 -s"
-  echo "would download docker images and binaries for version 1.4.0-rc1"
+  echo "e.g. bootstrap.sh 1.4.0-rc2 -s"
+  echo "would download docker images and binaries for version 1.4.0-rc2"
 }
 
 dockerFabricPull() {