From def6d19b2f66de60bffb8dbaf42f0b85d23ebdd4 Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Thu, 16 Apr 2020 17:22:29 -0400 Subject: [PATCH] Updates in master for v2.1.0 release Update master doc and bootstrap script for v2.1.0 release. Signed-off-by: David Enyeart --- Makefile | 2 +- README.md | 43 ++++++---------------------------------- docs/source/install.rst | 4 ++-- docs/source/whatsnew.rst | 13 ++++++------ scripts/bootstrap.sh | 6 +++--- 5 files changed, 19 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index 88fd2cc0f1c..be19a1c86b1 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ # - help-docs - generate the command reference docs ALPINE_VER ?= 3.11 -BASE_VERSION = 2.1.0 +BASE_VERSION = 2.2.0 # 3rd party image version # These versions are also set in the runners in ./integration/runners/ diff --git a/README.md b/README.md index 09e40e50698..15dfe456b1e 100644 --- a/README.md +++ b/README.md @@ -24,49 +24,18 @@ open source architecture; Hyperledger Fabric is your starting point. ## Releases -- [v2.0.0 - January 29, 2020](https://github.com/hyperledger/fabric/releases/tag/v2.0.0) -- [v2.0.0-beta - December 12, 2019](https://github.com/hyperledger/fabric/releases/tag/v2.0.0-beta) -- [v2.0.0-alpha - April 9, 2019](https://github.com/hyperledger/fabric/releases/tag/v2.0.0-alpha) -- [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) -- [v1.4.2 - July 17, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.2) -- [v1.4.1 - April 11, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.1) -- [v1.4.1-rc1 - March 29, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.1-rc1) -- [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) -- [v1.3.0-rc1 - September 24, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.3.0-rc1) -- [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) -- [v1.1.0-alpha - January 25, 2018](https://github.com/hyperledger/fabric/releases/tag/v1.1.0-alpha) -- [v1.0.5 - December 6, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.5) -- [v1.1.0-preview - November 1, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.1.0-preview) -- [v1.0.4 - October 31, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.4) -- [v1.0.3 - October 3, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.3) -- [v1.0.2 - September 10, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.2) -- [v1.0.1 - August 10, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.1) -- [v1.0.0 - July 11, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0) -- [v1.0.0-rc1 - June 23, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0-rc1) -- [v1.0.0-beta - June 8, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0-beta) -- [v1.0.0-alpha2 - May 14, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0-alpha2) -- [v1.0.0-alpha - March 16, 2017](https://github.com/hyperledger/fabric/releases/tag/v1.0.0-alpha) -- [v0.6.1-preview - October 15, 2016](https://github.com/hyperledger/fabric/releases/tag/v0.6.0-preview) -- [v0.6.0-preview - September 16, 2016](https://github.com/hyperledger/fabric/releases/tag/v0.6.0-preview) - -## Release Roadmap - -Please visit the [Hyperledger Fabric wiki](https://wiki.hyperledger.org/display/fabric/Hyperledger+Fabric+Roadmap) for our release roadmap. We plan on a quarterly release cadence following the v1.1.0 release, delivering on a scoped set of themes and select features. Unless specified otherwise, all releases will be upgradable from the prior minor release. +Fabric releases and release notes can be found on the [GitHub releases page](https://github.com/hyperledger/fabric/releases). + +Please visit the [Hyperledger Fabric Jira dashboard](https://jira.hyperledger.org/secure/Dashboard.jspa?selectPageId=10104) for our release roadmap. +We plan on a quarterly release cadence, delivering on a scoped set of themes and select features. +Unless specified otherwise, all releases will be upgradable from the prior minor release. ## Documentation, Getting Started and Developer Guides Please visit our online documentation for information on getting started using and developing with the fabric, SDK and chaincode: +- [v2.1](http://hyperledger-fabric.readthedocs.io/en/release-2.1/) - [v2.0](http://hyperledger-fabric.readthedocs.io/en/release-2.0/) - [v1.4](http://hyperledger-fabric.readthedocs.io/en/release-1.4/) - [v1.3](http://hyperledger-fabric.readthedocs.io/en/release-1.3/) diff --git a/docs/source/install.rst b/docs/source/install.rst index aa7f9f4c917..10cbb8c9bee 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -49,12 +49,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 the latest production releases - - **Fabric v2.0.0** and **Fabric CA v1.4.4** + **Fabric v2.1.0** and **Fabric CA v1.4.6** .. code:: bash curl -sSL https://bit.ly/2ysbOFE | bash -s -- - curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.0.0 1.4.4 0.4.18 + curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.1.0 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 index e4e77d3ff34..3218564ca8e 100644 --- a/docs/source/whatsnew.rst +++ b/docs/source/whatsnew.rst @@ -1,4 +1,4 @@ -What's new in Hyperledger Fabric v2.0 +What's new in Hyperledger Fabric v2.x ===================================== The first Hyperledger Fabric major release since v1.0, Fabric v2.0 @@ -6,9 +6,8 @@ delivers important new features and changes for users and operators alike, including support for new application and privacy patterns, enhanced governance around smart contracts, and new options for operating nodes. -What has stayed the same is the ability to upgrade network components on -your own terms, with support for rolling upgrades from v1.4.x, and the ability -to enable the new capabilities only when member organizations are ready. +Each v2.x minor release builds on the v2.0 release with minor features, +improvements, and bug fixes. Let's take a look at some of the highlights of the Fabric v2.0 release... @@ -194,7 +193,7 @@ in addition to cryptogen. For more information about this network, check out :doc:`test_network`. -Upgrading to Fabric v2.0 +Upgrading to Fabric v2.x ------------------------ A major new release brings some additional upgrade considerations. Rest assured @@ -211,9 +210,11 @@ Release notes The release notes provide more details for users moving to the new release. Specifically, take a look at the changes and deprecations that are being -announced with the new Fabric v2.0 release. +announced with the new Fabric v2.0 release, and the changes introduced in v2.1. * `Fabric v2.0.0 release notes `_. +* `Fabric v2.0.1 release notes `_. +* `Fabric v2.1.0 release notes `_. .. 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 index 018612b1efa..15b33b96b07 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -6,7 +6,7 @@ # # if version not passed in, default to latest released version -VERSION=2.0.0 +VERSION=2.1.0 # if ca version not passed in, default to latest released version CA_VERSION=1.4.6 # 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 2.0.0 1.4.6 0.4.18 -s" - echo "would download docker images and binaries for Fabric v2.0.0 and Fabric CA v1.4.6" + echo "e.g. bootstrap.sh 2.1.0 1.4.6 0.4.18 -s" + echo "would download docker images and binaries for Fabric v2.1.0 and Fabric CA v1.4.6" } # dockerPull() pulls docker images from fabric and chaincode repositories