From d973cb5df983bf2c7ed780bc111e3bb8c25c422e Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Fri, 27 Oct 2017 12:12:07 -0400
Subject: [PATCH] changelog and version

---
 CHANGELOG.md       | 12 ++++++++++++
 version/version.go |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91bd06494..5ed93b91c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.7.0 (October 27, 2017)
+
+BREAKING CHANGES:
+ - [cli] consolidate example apps under a single `abci-cli` binary
+
+IMPROVEMENTS:
+ - [cli] use spf13/cobra instead of urfave/cli
+ - [dummy] use iavl instead of merkleeyes, and add support for historical queries
+
+BUG FIXES:
+ - [client] fix deadlock on StopForError
+
 ## 0.6.0 (September 22, 2017)
 
 BREAKING CHANGES:
diff --git a/version/version.go b/version/version.go
index 34b1230ed..bbea51bcb 100644
--- a/version/version.go
+++ b/version/version.go
@@ -3,7 +3,7 @@ package version
 // NOTE: we should probably be versioning the ABCI and the abci-cli separately
 
 const Maj = "0"
-const Min = "6"
+const Min = "7"
 const Fix = "0"
 
-const Version = "0.6.0"
+const Version = "0.7.0"