From 81e446be605a4acdd9138b23ac50a470e808d2f6 Mon Sep 17 00:00:00 2001
From: Josh Baker <joshbaker77@gmail.com>
Date: Fri, 16 Mar 2018 09:32:04 -0700
Subject: [PATCH] 1.11.1

---
 CHANGELOG.md      | 10 ++++++++++
 README.md         |  2 +-
 build.sh          |  2 +-
 docker/Dockerfile |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12aa6803..b45e0ac0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.11.1] - 2018-03-16
+### Added
+- #272: Preserve Docker image tag history (@gechr)
+- 9428b84: Added cpu and threads to SERVER stats 
+### Fixed
+- #281: Linestring intersection failure (@contra)
+- #280: Filter id match before kNN results (@sweco-semtne)
+- #269: Safe atomic ints for arm32 (@gmonk63)
+- #267: Optimization for multiploygons intersect queries (@contra)
+
 ## [1.11.0] - 2018-03-05
 ### Added
 - #221: Add WHEREEVAL clause to scan/search commands (@rshura)
diff --git a/README.md b/README.md
index 434eeb5f..cbc78277 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 </p>
 <p align="center">
 <a href="https://gitter.im/tile38/tile38?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"><img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter"></a>
-<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.11.0-green.svg?" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.11.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 167e8279..3f525d4f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.11.0"
+VERSION="1.11.1"
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b46c18ce..11192c42 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4
 
-ENV TILE38_VERSION 1.11.0
+ENV TILE38_VERSION 1.11.1
 ENV TILE38_DOWNLOAD_URL https://github.com/tidwall/tile38/releases/download/$TILE38_VERSION/tile38-$TILE38_VERSION-linux-amd64.tar.gz
 
 RUN addgroup -S tile38 && adduser -S -G tile38 tile38