Merge pull request #404

4e97637 Raise integer version to 1100001 (dexX7) fbaa81f Update release notes for 0.0.11-rel (dexX7) 545bc2e Bump version to Omni Core 0.0.11-rel (dexX7)
OmniLayer · Jul 20, 2016 · 59a5cc0 · 59a5cc0
2 parents 2b09a7e + 4e97637
commit 59a5cc0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/configure.ac b/configure.ac
@@ -10,8 +10,8 @@ define(_OMNICORE_VERSION_MILESTONE, 0)
 define(_OMNICORE_VERSION_MAJOR, 0)
 define(_OMNICORE_VERSION_MINOR, 11)
 define(_OMNICORE_VERSION_PATCH, 0)
-define(_OMNICORE_VERSION_BUILD, 0)
-define(_OMNICORE_VERSION_STATUS, rc2)
+define(_OMNICORE_VERSION_BUILD, 1)
+define(_OMNICORE_VERSION_STATUS, rel)
 AC_INIT([Omni Core],[_OMNICORE_VERSION_MILESTONE._OMNICORE_VERSION_MAJOR._OMNICORE_VERSION_MINOR._OMNICORE_VERSION_PATCH-_OMNICORE_VERSION_STATUS],[https://github.com/OmniLayer/omnicore/issues],[omnicore],[http://www.omnilayer.org/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])

diff --git a/src/omnicore/doc/release-notes.md b/src/omnicore/doc/release-notes.md
@@ -200,6 +200,10 @@ The following list includes relevant pull requests merged into this release:
 - #400 Change default confirm target to 15 blocks
 - #398 Update release notes for 0.0.11-rc2
 - #397 Bump version to Omni Core 0.0.11-rc2
+- #402 Add seed blocks for 410,000 to 420,000
+- #403 Add consensus hash for block 420,000
+- #405 Use uint256 when calculating desired BTC for DEx 1
+- #404 Bump version to Omni Core 0.0.11-rel
 ```
 
 Credits

diff --git a/src/omnicore/test/version_tests.cpp b/src/omnicore/test/version_tests.cpp
@@ -22,18 +22,18 @@ BOOST_AUTO_TEST_CASE(version_comparison)
 
 BOOST_AUTO_TEST_CASE(version_string)
 {
-    BOOST_CHECK_EQUAL(OmniCoreVersion(), "0.0.11-rc2");
+    BOOST_CHECK_EQUAL(OmniCoreVersion(), "0.0.11-rel");
 }
 
 BOOST_AUTO_TEST_CASE(version_number)
 {
-    BOOST_CHECK_EQUAL(OMNICORE_VERSION, 1100000);
+    BOOST_CHECK_EQUAL(OMNICORE_VERSION, 1100001);
 }
 
 BOOST_AUTO_TEST_CASE(config_package_version)
 {
     // the package version is used in the file names:
-    BOOST_CHECK_EQUAL(PACKAGE_VERSION, "0.0.11.0-rc2");
+    BOOST_CHECK_EQUAL(PACKAGE_VERSION, "0.0.11.0-rel");
 }
 
 

diff --git a/src/omnicore/version.h b/src/omnicore/version.h
@@ -24,10 +24,10 @@
 #define OMNICORE_VERSION_PATCH       0
 
 // Non-public build number/revision (usually zero)
-#define OMNICORE_VERSION_BUILD       0
+#define OMNICORE_VERSION_BUILD       1
 
 // Use "dev" for development versions, switch to "rc" for release candidates
-#define OMNICORE_VERSION_STATUS      rc2
+#define OMNICORE_VERSION_STATUS      rel
 
 
 #endif // HAVE_CONFIG_H