Release commit for v2.2.1

Final commit for v2.2.1 including doc, script, and release note updates.

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

Makefile

@@ -45,7 +45,7 @@
 #   - verify - runs unit tests for only the changed package tree
 
 ALPINE_VER ?= 3.12
-BASE_VERSION = 2.2.0
+BASE_VERSION = 2.2.1
 
 # 3rd party image version
 # These versions are also set in the runners in ./integration/runners/

docs/source/install.rst

@@ -47,12 +47,12 @@ the binaries and images.
 
 .. note:: If you want a specific release, pass a version identifier for Fabric and Fabric-CA docker images.
           The command below demonstrates how to download the latest production releases -
-          **Fabric v2.2.0** and **Fabric CA v1.4.7**
+          **Fabric v2.2.1** and **Fabric CA v1.4.9**
 
 .. code:: bash
 
   curl -sSL https://bit.ly/2ysbOFE | bash -s -- <fabric_version> <fabric-ca_version>
-  curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.2.0 1.4.7
+  curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.2.1 1.4.9
 
 .. note:: If you get an error running the above curl command, you may
           have too old a version of curl that does not handle
@@ -64,7 +64,7 @@ the binaries and images.
 	  the un-shortened URL:
 	  https://raw.githubusercontent.com/hyperledger/fabric/{BRANCH}/scripts/bootstrap.sh
 
-.. note:: For additional use pattern you can use the -h flag to view the help and available commands for the 
+.. note:: For additional use pattern you can use the -h flag to view the help and available commands for the
           Fabric-Samples bootstrap script. For example:
           ``curl -sSL https://bit.ly/2ysbOFE | bash -s -- -h``
 

docs/source/whatsnew.rst

@@ -220,6 +220,7 @@ announced in each of the v2.x releases.
 * `Fabric v2.1.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.1.0>`_.
 * `Fabric v2.1.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.1.1>`_.
 * `Fabric v2.2.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.0>`_.
+* `Fabric v2.2.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.1>`_.
 
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/

release_notes/v2.2.1.md

@@ -1,5 +1,5 @@
-v2.2.1 Release Notes - TBD, 2020
-================================
+v2.2.1 Release Notes - September 30, 2020
+=========================================
 
 What's New in Hyperledger Fabric v2.2.1
 ---------------------------------------
@@ -51,7 +51,17 @@ provider tracks active sessions. If some condition occurs that results
 in all sessions being closed, cached object handles are no longer valid
 so the handle cache is purged.
 
-**FAB-18208: Do not sign gossip message if membership is empty**
+**FAB-18250: peer and orderer PKCS#11 - Introduce error checking for evicting invalid PKCS#11 sessions**
+
+FAB-17722 introduced a call to the pkcs11 GetSessionInfo function for retrieving the current state of
+the PKCS11 session. The result of this function was used to determine whether a session was still
+valid to perform HSM operations or if it should be evicted from the session pool. Performance tests
+showed that the call to GetSessionInfo was computationally prohibitively expensive. FAB-18242 reverted
+this change and FAB-18250 introduced a new method for determining if the PKCS11 session is invalid.
+Now when an HSM operation fails, we check the resultant error against the known session error codes and
+evict the session from the pool if the error was the result of an invalid session.
+
+**FAB-18208: peer - Do not sign gossip message if membership is empty**
 
 This change suppresses the signing of gossip messages if the message will not get
 sent regardless due to an empty gossip membership. The change reduces CPU consumption
@@ -109,15 +119,6 @@ However, chaincode still attempted to retrieve from the cache,
 and therefore an incorrect value may be retrieved.
 The fix ensures that for values larger than 64kb, the data will be retrieved from CouchDB.
 
-**FAB-18250: Introduce error checking for evicting invalid PKCS11 sessions**
-
-FAB-17722 introduced a call to the pkcs11 GetSessionInfo function for retrieving the current state of
-the PKCS11 session. The result of this function was used to determine whether a session was still
-valid to perform HSM operations or if it should be evicted from the session pool. Performance tests
-showed that the call to GetSessionInfo was computationally prohibitively expensive. FAB-18242 reverted 
-this change and FAB-18250 introduced a new method for determining if the PKCS11 session is invalid.
-Now when an HSM operation fails, we check the resultant error against the known session error codes and 
-evict the session from the pool if the error was the result of an invalid session. 
 
 Deprecations (existing)
 -----------------------

scripts/bootstrap.sh

@@ -6,9 +6,9 @@
 #
 
 # if version not passed in, default to latest released version
-VERSION=2.2.0
+VERSION=2.2.1
 # if ca version not passed in, default to latest released version
-CA_VERSION=1.4.7
+CA_VERSION=1.4.9
 ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')")
 MARCH=$(uname -m)
 
@@ -21,8 +21,8 @@ printHelp() {
     echo "-s : bypass fabric-samples repo clone"
     echo "-b : bypass download of platform-specific binaries"
     echo
-    echo "e.g. bootstrap.sh 2.2.0 1.4.7 -s"
-    echo "will download docker images and binaries for Fabric v2.2.0 and Fabric CA v1.4.7"
+    echo "e.g. bootstrap.sh 2.2.1 1.4.9 -s"
+    echo "will download docker images and binaries for Fabric v2.2.1 and Fabric CA v1.4.9"
 }
 
 # dockerPull() pulls docker images from fabric and chaincode repositories