From ab88de146c91bc5d2e1cf9d643bebfd56cd83387 Mon Sep 17 00:00:00 2001
From: David Enyeart <enyeart@us.ibm.com>
Date: Mon, 1 Jun 2020 08:06:59 -0400
Subject: [PATCH] Updates in master for v2.1.1 release

Update master doc and bootstrap script for v2.1.1 release.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
---
 docs/source/install.rst  | 4 ++--
 docs/source/whatsnew.rst | 1 +
 scripts/bootstrap.sh     | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/source/install.rst b/docs/source/install.rst
index 2a0dc98ea66..5f7c7269ce3 100644
--- 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 the latest production releases -
-          **Fabric v2.1.0** and **Fabric CA v1.4.7**
+          **Fabric v2.1.1** and **Fabric CA v1.4.7**
 
 .. code:: bash
 
   curl -sSL https://bit.ly/2ysbOFE | bash -s -- <fabric_version> <fabric-ca_version> <thirdparty_version>
-  curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.1.0 1.4.7 0.4.20
+  curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.1.1 1.4.7 0.4.20
 
 .. 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 3218564ca8e..5215d174394 100644
--- a/docs/source/whatsnew.rst
+++ b/docs/source/whatsnew.rst
@@ -215,6 +215,7 @@ announced with the new Fabric v2.0 release, and the changes introduced in v2.1.
 * `Fabric v2.0.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.0.0>`_.
 * `Fabric v2.0.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.0.1>`_.
 * `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>`_.
 
 .. 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 a39172b9ab6..4b8e5b00d93 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.1.0
+VERSION=2.1.1
 # if ca version not passed in, default to latest released version
 CA_VERSION=1.4.7
 # 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.1.0 1.4.7 0.4.18 -s"
-    echo "would download docker images and binaries for Fabric v2.1.0 and Fabric CA v1.4.7"
+    echo "e.g. bootstrap.sh 2.1.1 1.4.7 0.4.20 -s"
+    echo "would download docker images and binaries for Fabric v2.1.1 and Fabric CA v1.4.7"
 }
 
 # dockerPull() pulls docker images from fabric and chaincode repositories