From 54d6081cfebdf2c904d2e3b3315052391124f872 Mon Sep 17 00:00:00 2001
From: Josh Baker <joshbaker77@gmail.com>
Date: Mon, 30 Apr 2018 16:27:56 -0700
Subject: [PATCH] 1.12.1

---
 CHANGELOG.md | 8 ++++++++
 README.md    | 2 +-
 build.sh     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2b4c230..6fea25a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.12.1] - 2018-04-30
+### Fixed
+- #300: Fix pdelhooks not persisting (@tobilg)
+- #293: Fix kafka lockup issue (@Joey92)
+- #301: Fix AMQP uri custom params not working (@tobilg)
+- #302: Fix tile with zoom level over 63 panics (@rshura)
+- b99cd39: Fix Sync hook msg ttl with server time
+
 ## [1.12.0] - 2018-04-12
 ### Added
 - 11b42c0: Option to disable AOF or to use a custom path: #220 #223 #297 (@sign0, @umpc, @fmr683, @zhangfeng158)
diff --git a/README.md b/README.md
index ebd1ee81..38f3c2d4 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 </p>
 <p align="center">
 <a href="https://join.slack.com/t/tile38/shared_invite/enQtMzQ0OTEwMDUxMzc5LTc0NTJjZmM3YjFhOGZiZGU2NDNjOWEwM2Q5ZWE3MzFiYWZkZDIyN2U2ZmUzZDBmODU0MjI1ZjQ0N2Y1M2I1NTg"><img src="https://img.shields.io/badge/slack-channel-orange.svg" alt="Slack Channel"></a>
-<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.12.0-green.svg?" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.12.1-green.svg?" alt="Version"></a>
 <a href="https://travis-ci.org/tidwall/tile38"><img src="https://travis-ci.org/tidwall/tile38.svg?branch=master" alt="Build Status"></a>
 <a href="https://hub.docker.com/r/tile38/tile38"><img src="https://img.shields.io/badge/docker-ready-blue.svg" alt="Docker Ready"></a>
 </p>
diff --git a/build.sh b/build.sh
index 61ee403c..08908670 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@ set -e
 cd $(dirname "${BASH_SOURCE[0]}")
 OD="$(pwd)"
 
-VERSION=$(git describe --tags --abbrev=0)
+VERSION=1.12.1
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package