Skip to content

Commit

Permalink
FAB-10750 prepare release v1.2.0-rc1
Browse files Browse the repository at this point in the history
Change-Id: I1a1e93177eb15485278b8ed08947cd1a75d6c0a1
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
christo4ferris committed Jun 21, 2018
1 parent 614bc53 commit 9df3ff5
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 449 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
# - docker-tag-latest - re-tags the images made by 'make docker' with the :latest tag
# - help-docs - generate the command reference docs

BASE_VERSION = 1.2.0
BASE_VERSION = 1.2.0-rc1
PREV_VERSION = 1.1.0
CHAINTOOL_RELEASE=1.1.1
BASEIMAGE_RELEASE=0.4.8
Expand All @@ -56,7 +56,7 @@ PROJECT_NAME = $(PROJECT_NAME)/fabric
else
PROJECT_NAME = hyperledger/fabric
endif
EXPERIMENTAL ?= true
EXPERIMENTAL ?= false

BUILD_DIR ?= .build

Expand Down
4 changes: 2 additions & 2 deletions docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Fabric Samples and binaries, go ahead and execute the following command:

.. code:: bash
curl -sSL https://goo.gl/6wtTN5 | bash -s 1.1.0
curl -sSL http://bit.ly/2ysbOFE | bash -s 1.2.0-rc1
.. note:: If you get an error running the above curl command, you may
have too old a version of curl that does not handle
Expand All @@ -54,7 +54,7 @@ Fabric Samples and binaries, go ahead and execute the following command:
https://github.com/hyperledger/fabric/blob/master/scripts/bootstrap.sh

.. note:: You can use the command above for any published version of Hyperledger
Fabric. Simply replace '1.1.0' with the version identifier
Fabric. Simply replace '1.2.0-rc1' with the version identifier
of the version you wish to install.

The command above downloads and executes a bash script
Expand Down
Loading

0 comments on commit 9df3ff5

Please sign in to comment.