Prepare 1.1pre2

README.rst

@@ -134,6 +134,16 @@ Roadmap
 ChangeLog
 =========
 
+Version 1.1pre2
+---------------
+
+- peerdisc: handle protocol 1.1 server replies
+- issue `#251`_: fix protocol version reported in server.peers.subscribe
+- fix handling of failed transaction broadcast
+- fix typos (SomberNight)
+- doc and test updates
+- dash: return errors in JSON error field for protocol 1.1
+
 Version 1.1pre1
 ---------------
 
@@ -339,6 +349,7 @@ Version 1.0
 .. _#163: https://github.com/kyuupichan/electrumx/issues/163
 .. _#180: https://github.com/kyuupichan/electrumx/issues/180
 .. _#223: https://github.com/kyuupichan/electrumx/issues/223
+.. _#251: https://github.com/kyuupichan/electrumx/issues/251
 .. _docs/HOWTO.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/HOWTO.rst
 .. _docs/ENVIRONMENT.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/ENVIRONMENT.rst
 .. _docs/PEER_DISCOVERY.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/PEER_DISCOVERY.rst

server/version.py

@@ -1,5 +1,5 @@
 # Server name and protocol versions
 
-VERSION = 'ElectrumX 1.1pre1'
+VERSION = 'ElectrumX 1.1pre2'
 PROTOCOL_MIN = '0.9'
 PROTOCOL_MAX = '1.1'