Merge pull request #5234 from EOSIO/feature/bump-version-to-1.1.5

bump version to 1.1.5
EOSIO · Aug 14, 2018 · 817b1d0 · 817b1d0
2 parents 9309251 + ef8322c
commit 817b1d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 1)
-set(VERSION_PATCH 4)
+set(VERSION_PATCH 5)
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( GUI_CLIENT_EXECUTABLE_NAME eosio )

diff --git a/Docker/README.md b/Docker/README.md
@@ -20,10 +20,10 @@ cd eos/Docker
 docker build . -t eosio/eos
 ```
 
-The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.1.4 tag, you could do the following:
+The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.1.5 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.1.4 --build-arg branch=v1.1.4 .
+docker build -t eosio/eos:v1.1.5 --build-arg branch=v1.1.5 .
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.