From f20859a8a64879a1f4658c7c87dc9dbd18da2898 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Wed, 23 Nov 2016 09:55:54 +0900
Subject: [PATCH] Prepare 0.7.4

---
 docs/RELEASE-NOTES | 9 +++++++++
 server/version.py  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/RELEASE-NOTES b/docs/RELEASE-NOTES
index 147e359..7d67cbe 100644
--- a/docs/RELEASE-NOTES
+++ b/docs/RELEASE-NOTES
@@ -1,3 +1,12 @@
+version 0.7.4
+-------------
+
+- really fix reorgs, they still triggered an assertion.  If you hit a reorg
+  I believe your DB is fine and all you need to do is restart with updated
+  software
+- introduced a new debug env var FORCE_REORG which I used to simulate a
+  reorg and confirm they should work
+
 version 0.7.3
 -------------
 
diff --git a/server/version.py b/server/version.py
index 7fab096..aa6eb22 100644
--- a/server/version.py
+++ b/server/version.py
@@ -1 +1 @@
-VERSION = "ElectrumX 0.7.3"
+VERSION = "ElectrumX 0.7.4"