From 69bfba80a42a6948161bbcd01c775b9e8911529a Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Tue, 8 Jan 2019 12:16:38 -0500 Subject: [PATCH] [FAB-13555] Release fabric v1.4.0 Change-Id: I8e568ab2088e68df2e8c804dfef2bce5a311f6fe Signed-off-by: David Enyeart --- CHANGELOG.md | 16 ++++++++++++++++ README.md | 1 + docs/source/install.rst | 6 +++--- docs/source/whatsnew.rst | 4 ++-- release_notes/v1.4.0.txt | 6 +++--- scripts/bootstrap.sh | 6 +++--- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dab56e23390..e2673199cef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## v1.4.0 +Tue Jan 8 12:04:49 EST 2019 + +* [b43fcc7](https://github.com/hyperledger/fabric/commit/b43fcc7) [FAB-12056](https://jira.hyperledger.org/browse/FAB-12056) Pvt data tutorial to use transient +* [491df44](https://github.com/hyperledger/fabric/commit/491df44) [FAB-13357](https://jira.hyperledger.org/browse/FAB-13357) Fixed error in fabric gossip documentation +* [24c409a](https://github.com/hyperledger/fabric/commit/24c409a) [BE-510] Policies documentation typo fix +* [a83e1ca](https://github.com/hyperledger/fabric/commit/a83e1ca) [FAB-13411](https://jira.hyperledger.org/browse/FAB-13411) fix flake in TestServerInterceptors +* [7203735](https://github.com/hyperledger/fabric/commit/7203735) [FAB-12995](https://jira.hyperledger.org/browse/FAB-12995) Add new functions to the example cc +* [3c0d63c](https://github.com/hyperledger/fabric/commit/3c0d63c) Explicitly set ext key usage for CA +* [155120d](https://github.com/hyperledger/fabric/commit/155120d) Increase timeout for TestHaltBeforeTimeout +* [7d09ca6](https://github.com/hyperledger/fabric/commit/7d09ca6) [FAB-13463](https://jira.hyperledger.org/browse/FAB-13463) Document vendoring - part2 +* [b17d88f](https://github.com/hyperledger/fabric/commit/b17d88f) [FAB-13463](https://jira.hyperledger.org/browse/FAB-13463) Document vendoring for shim extensions +* [99959b9](https://github.com/hyperledger/fabric/commit/99959b9) [FAB-13381](https://jira.hyperledger.org/browse/FAB-13381) Update dev mode documentation +* [9cd9fce](https://github.com/hyperledger/fabric/commit/9cd9fce) [FAB-13351](https://jira.hyperledger.org/browse/FAB-13351) Test Robustification +* [0311c83](https://github.com/hyperledger/fabric/commit/0311c83) [FAB-13391](https://jira.hyperledger.org/browse/FAB-13391) Prepare for next release (1.4.0) + ## v1.4.0-rc2 Thu Dec 20 08:36:43 EST 2018 diff --git a/README.md b/README.md index 394a608c27d..07c26b9369b 100644 --- a/README.md +++ b/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) diff --git a/docs/source/install.rst b/docs/source/install.rst index 0f9edafbc50..0fdaeda0693 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -41,7 +41,7 @@ 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. @@ -49,7 +49,7 @@ Fabric Samples and binaries, go ahead and execute the following command: .. code:: bash curl -sSL http://bit.ly/2ysbOFE | bash -s - 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 diff --git a/docs/source/whatsnew.rst b/docs/source/whatsnew.rst index 12a9a1405b0..abf83962bdd 100644 --- 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 `_. -* `Fabric CA release notes `_. +* `Fabric release notes `_. +* `Fabric CA release notes `_. .. 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 index 44a81a631b7..b23cb518190 100644 --- a/release_notes/v1.4.0.txt +++ b/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 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a8d8d20b1e6..0e3cbbafcee 100755 --- 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-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() {