From 19f53a61ba40185e0fbd54c487afb3e296c11735 Mon Sep 17 00:00:00 2001
From: Josh Baker <joshbaker77@gmail.com>
Date: Mon, 5 Mar 2018 11:21:04 -0700
Subject: [PATCH] 1.11.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c616030..12aa6803 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.11.0] - 2018-03-05
+### Added
+- #221: Add WHEREEVAL clause to scan/search commands (@rshura)
+### Fixed
+- #254: Add maxmemory protection to FSET (@rshura)
+- #258: Clear expires on reset (@zycbobby)
+- #268: Avoid bbox intersect for non-bbox objects (@contra)
+
 ## [1.10.1] - 2018-01-17
 ### Fixed
 - #244: Fix issue with points not being detected inside MultiPolygons (@fazlul3003)
diff --git a/README.md b/README.md
index ddced54c..7cbc9862 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.10.1-green.svg?" alt="Version"></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://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 4c2d8c9b..167e8279 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.10.1"
+VERSION="1.11.0"
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5ffad9b0..b46c18ce 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4
 
-ENV TILE38_VERSION 1.10.1
+ENV TILE38_VERSION 1.11.0
 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