From 64044d04a775e12a9c0f359d7ccf9a0e46cd8548 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 27 Mar 2018 11:33:09 -0400
Subject: [PATCH] changelog, version, dep

---
 CHANGELOG.md       |  3 ++-
 Gopkg.lock         | 12 ++++++------
 Gopkg.toml         |  2 +-
 version/version.go |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c96cac9f8b9d..01d342ef6435 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.12.0 (TBD)
+## 0.12.0 (March 27 2018)
 
 BREAKING CHANGES
 
@@ -17,6 +17,7 @@ BREAKING CHANGES
 FEATURES
 
 * [examples/basecoin] New cool module to demonstrate use of state and custom transactions
+* [basecoind] `show_node_id` command
 * [lcd] Implement the Light Client Daemon and endpoints
 * [types/stdlib] Queue functionality
 * [store] Subspace iterator on IAVLTree
diff --git a/Gopkg.lock b/Gopkg.lock
index 74caff2ae7ce..46cb95893f9e 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -303,7 +303,6 @@
   version = "v0.7.0"
 
 [[projects]]
-  branch = "develop"
   name = "github.com/tendermint/tendermint"
   packages = [
     "blockchain",
@@ -342,7 +341,8 @@
     "version",
     "wire"
   ]
-  revision = "e3337d764a0da9b4f8ed84a65cd842a2a08d72b0"
+  revision = "6f9956990c444d53f62f2a3905ed410cfe9afe77"
+  version = "v0.17.1"
 
 [[projects]]
   name = "github.com/tendermint/tmlibs"
@@ -396,7 +396,7 @@
   branch = "master"
   name = "golang.org/x/sys"
   packages = ["unix"]
-  revision = "91ee8cde435411ca3f1cd365e8f20131aed4d0a1"
+  revision = "13d03a9a82fba647c21a0ef8fba44a795d0f0835"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -452,12 +452,12 @@
 [[projects]]
   name = "gopkg.in/yaml.v2"
   packages = ["."]
-  revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5"
-  version = "v2.1.1"
+  revision = "86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb"
+  version = "v2.2.0"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "25be8b1057a6f24ab743bf0602823e83fb42f42b6a6ba4ba0925c783df97d9c1"
+  inputs-digest = "0eb39694057c8ab8c9ecbaeb25bc43cbf1d2422976a09a67392a62dcef149a7b"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 4fb8d67b3481..e3df3d6946c7 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -70,7 +70,7 @@
   name = "github.com/tendermint/iavl"
 
 [[constraint]]
-  branch = "develop"
+  version = "~0.17.1"
   name = "github.com/tendermint/tendermint"
 
 [[constraint]]
diff --git a/version/version.go b/version/version.go
index 6cbe2c4bb0f8..59f530bfb4c7 100644
--- a/version/version.go
+++ b/version/version.go
@@ -9,7 +9,7 @@ const Maj = "0"
 const Min = "12"
 const Fix = "0"
 
-const Version = "0.12.0-dev"
+const Version = "0.12.0"
 
 // GitCommit set by build flags
 var GitCommit = ""