Preparations for 0.10.2 release

6 files changed, 9 insertions, 40 deletions

diff --git a/configure.ac b/configure.ac
index 695e4665f5..579035f59a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 10)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2015)
diff --git a/doc/Doxyfile b/doc/Doxyfile
index aee5dbe079..92b304a448 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -34,7 +34,7 @@ PROJECT_NAME           = Bitcoin
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.10.1
+PROJECT_NUMBER         = 0.10.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 
diff --git a/doc/README.md b/doc/README.md
index 78a59af5b9..effa0e8639 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,4 +1,4 @@
-Bitcoin Core 0.10.1
+Bitcoin Core 0.10.2
 =====================
 
 Setup
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index b854505e90..9065f43621 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin Core 0.10.1

+Bitcoin Core 0.10.2

 =====================

 

 Intro

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 5e939600a0..55d6eb024e 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,8 +1,8 @@
-Bitcoin Core version 0.10.1 is now available from:
+Bitcoin Core version 0.10.2 is now available from:
 
-  <https://bitcoin.org/bin/bitcoin-core-0.10.1/>
+  <https://bitcoin.org/bin/bitcoin-core-0.10.2/>
 
-This is a new minor version release, bringing bug fixes and translation 
+This is a new minor version release, bringing minor bug fixes and translation 
 updates. It is recommended to upgrade to this version.
 
 Please report bugs using the issue tracker at github:
@@ -50,60 +50,29 @@ This is a minor release and hence there are no notable changes.
 For the notable changes in 0.10, refer to the release notes for the
 0.10.0 release at https://github.com/bitcoin/bitcoin/blob/v0.10.0/doc/release-notes.md
 
-0.10.1 Change log
+0.10.2 Change log
 =================
 
 Detailed release notes follow. This overview includes changes that affect external
 behavior, not code moves, refactors or string updates.
 
 RPC:
-- `7f502be` fix crash: createmultisig and addmultisigaddress
-- `eae305f` Fix missing lock in submitblock
 
 Block (database) and transaction handling:
-- `1d2cdd2` Fix InvalidateBlock to add chainActive.Tip to setBlockIndexCandidates
-- `c91c660` fix InvalidateBlock to repopulate setBlockIndexCandidates
-- `002c8a2` fix possible block db breakage during re-index
-- `a1f425b` Add (optional) consistency check for the block chain data structures
-- `1c62e84` Keep mempool consistent during block-reorgs
-- `57d1f46` Fix CheckBlockIndex for reindex
-- `bac6fca` Set nSequenceId when a block is fully linked
 
 P2P protocol and network code:
-- `78f64ef` don't trickle for whitelisted nodes
-- `ca301bf` Reduce fingerprinting through timestamps in 'addr' messages.
-- `200f293` Ignore getaddr messages on Outbound connections.
-- `d5d8998` Limit message sizes before transfer
-- `aeb9279` Better fingerprinting protection for non-main-chain getdatas.
-- `cf0218f` Make addrman's bucket placement deterministic (countermeasure 1 against eclipse attacks, see http://cs-people.bu.edu/heilman/eclipse/)
-- `0c6f334` Always use a 50% chance to choose between tried and new entries (countermeasure 2 against eclipse attacks)
-- `214154e` Do not bias outgoing connections towards fresh addresses (countermeasure 2 against eclipse attacks)
-- `aa587d4` Scale up addrman (countermeasure 6 against eclipse attacks)
-- `139cd81` Cap nAttempts penalty at 8 and switch to pow instead of a division loop
 
 Validation:
-- `d148f62` Acquire CCheckQueue's lock to avoid race condition
 
 Build system:
-- `8752b5c` 0.10 fix for crashes on OSX 10.6
 
 Wallet:
-- N/A
 
 GUI:
-- `2c08406` some mac specifiy cleanup (memory handling, unnecessary code)
-- `81145a6` fix OSX dock icon window reopening
-- `786cf72` fix a issue where "command line options"-action overwrite "Preference"-action (on OSX)
 
 Tests:
-- `1117378` add RPC test for InvalidateBlock
 
 Miscellaneous:
-- `c9e022b` Initialization: set Boost path locale in main thread
-- `23126a0` Sanitize command strings before logging them.
-- `323de27` Initialization: setup environment before starting QT tests
-- `7494e09` Initialization: setup environment before starting tests
-- `df45564` Initialization: set fallback locale as environment variable
 
 Credits
 =======
diff --git a/src/clientversion.h b/src/clientversion.h
index a6b5a14faf..e0bdea60e9 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -16,7 +16,7 @@
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 0
 #define CLIENT_VERSION_MINOR 10
-#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_REVISION 2
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build