From 8cfa42ed9cc7c46f9a4fde49854c7710b2863484 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Sat, 9 Sep 2017 10:51:43 +0900
Subject: [PATCH] Prepare 1.1

---
 README.rst        | 13 +++++++++++++
 server/version.py |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 545df38..d8e3bfd 100644
--- a/README.rst
+++ b/README.rst
@@ -134,6 +134,19 @@ Roadmap
 ChangeLog
 =========
 
+Version 1.1
+-----------
+
+See the changelogs below for recent changes.  The most important is
+that for mainnet bitcoin **NET** must now be *mainnet* and you must
+choose a **COIN** from *BitcoinCash* and *BitcoinSegwit*.  Similarly
+for testnets.  These coins will likely diverge further in future so
+it's best they become separate coins now.
+
+- no longer persist peers, rediscover on restart
+- onion peers only reported if can connect; hard-coded exception removed
+- small fix for blockchain.transaction.broadcast
+
 Version 1.1pre2
 ---------------
 
diff --git a/server/version.py b/server/version.py
index 9938fe3..6536dc4 100644
--- a/server/version.py
+++ b/server/version.py
@@ -1,5 +1,5 @@
 # Server name and protocol versions
 
-VERSION = 'ElectrumX 1.1pre2'
+VERSION = 'ElectrumX 1.1'
 PROTOCOL_MIN = '0.9'
 PROTOCOL_MAX = '1.1'