From 346c09e6eab02534165b88401f099a56371c70c2 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <mfisher@deis.com>
Date: Wed, 26 Oct 2016 19:51:55 -0700
Subject: [PATCH] bump to v0.12.1

---
 CHANGELOG            | 6 ++++++
 docs/installation.md | 4 ++--
 version.go           | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 082960aff..73e359e0b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+### v0.12.1
+
+17e1d2a Revert "json-backend: initial pass of json backend"
+c91406c Revert "json-backend: tests and support for nested objects"
+0df8af7 Revert "json-backend: cleanup"
+
 ### v0.12.0
 
 7ac1091 Upgrade Dockerfile to use latest stable Alpine which has Go 1.6
diff --git a/docs/installation.md b/docs/installation.md
index d77830ac7..d59f630ab 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -7,13 +7,13 @@ Currently confd ships binaries for OS X and Linux 64bit systems. You can downloa
 #### OS X
 
 ```
-$ wget https://github.com/bacongobbler/confd/releases/download/v0.12.0/confd-0.12.0-darwin-amd64
+$ wget https://github.com/bacongobbler/confd/releases/download/v0.12.1/confd-0.12.1-darwin-amd64
 ```
 
 #### Linux
 
 ```
-$ wget https://github.com/bacongobbler/confd/releases/download/v0.12.0/confd-0.12.0-linux-amd64
+$ wget https://github.com/bacongobbler/confd/releases/download/v0.12.1/confd-0.12.1-linux-amd64
 ```
 
 #### Building from Source
diff --git a/version.go b/version.go
index cb8705644..02e8c5cae 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package main
 
-const Version = "0.13.0-dev"
+const Version = "0.12.1"