Merge pull request #211 from EOSIO/release/1.6.x-version

Bump version to v1.6.0
EOSIO · Mar 29, 2019 · 8c03c91 · 8c03c91
2 parents f1a5c68 + 2eb6b8a
commit 8c03c91
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(eosio_contracts)
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 6)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX rc3)
+#set(VERSION_SUFFIX rc3)
 
 if (VERSION_SUFFIX)
    set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # eosio.contracts
 
-## Version : 1.6.0-rc3
+## Version : 1.6.0
 
 The design of the EOSIO blockchain calls for a number of smart contracts that are run at a privileged permission level in order to support functions such as block producer registration and voting, token staking for CPU and network bandwidth, RAM purchasing, multi-sig, etc.  These smart contracts are referred to as the system, token, msig and wrap (formerly known as sudo) contracts.
 
@@ -14,7 +14,7 @@ The following unprivileged contract(s) are also part of the system.
    * [eosio.token](https://github.com/eosio/eosio.contracts/tree/master/eosio.token)
 
 Dependencies:
-* [eosio v1.6.x](https://github.com/EOSIO/eos/releases/tag/v1.6.3)
+* [eosio v1.7.x](https://github.com/EOSIO/eos/releases/tag/v1.7.0)
 * [eosio.cdt v1.5.x](https://github.com/EOSIO/eosio.cdt/releases/tag/v1.5.0)
 
 To build the contracts and the unit tests:

diff --git a/contracts/eosio.system/src/rex.cpp b/contracts/eosio.system/src/rex.cpp
@@ -759,7 +759,7 @@ namespace eosiosystem {
                      order.stake_change.amount = result.stake_change.amount;
                      order.close();
                   });
-                  /// send dummy action to show and owner and proceeds of filled sellrex order
+                  /// send dummy action to show owner and proceeds of filled sellrex order
                   rex_results::orderresult_action order_act( rex_account, std::vector<eosio::permission_level>{ } );
                   order_act.send( order_owner, result.proceeds );
                }

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required( VERSION 3.5 )
 
-set(EOSIO_VERSION_MIN "1.4")
-set(EOSIO_VERSION_SOFT_MAX "1.6")
+set(EOSIO_VERSION_MIN "1.6")
+set(EOSIO_VERSION_SOFT_MAX "1.7")
 #set(EOSIO_VERSION_HARD_MAX "")
 
 find_package(eosio)