Merge branch 'release-0.4' into develop

2016-11-12 21:53:53 +09:00 · 2016-11-12 21:53:53 +09:00 · 64b184b5e6
commit 64b184b5e6
parent 1d52e6ffb5 751bb2d970
3 changed files with 3 additions and 3 deletions
--- a/docs/RELEASE-NOTES
+++ b/docs/RELEASE-NOTES
@ -1,7 +1,7 @@
 version 0.4
 -----------

- IRC connectivity.  See the notes.
+- IRC connectivity.  See the notes for environment variables, etc.
 - logging improvements

 Version 0.3.2, 0.3.3
--- a/server/protocol.py
+++ b/server/protocol.py
@ -43,7 +43,7 @@ class BlockServer(BlockProcessor):
        self.irc = IRC(env)

    async def caught_up(self, mempool_hashes):
-        await super().caught_up([]) #mempool_hashes)
+        await super().caught_up(mempool_hashes)
        if not self.servers:
            await self.start_servers()
            if self.env.irc:
--- a/server/version.py
+++ b/server/version.py
@ -1 +1 @@
-VERSION = "ElectrumX 0.3.3"
+VERSION = "ElectrumX 0.4"