From 206f4996e2949f6f283ce19838b6f884c9f90320 Mon Sep 17 00:00:00 2001
From: Josh Baker <joshbaker77@gmail.com>
Date: Mon, 18 Dec 2017 10:10:17 -0700
Subject: [PATCH] 1.10.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 396af989..9253ad61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.10.0] - 2017-12-18
+### Added
+- #221: Sqs endpoint (@ennycampino)
+- #226: Lua scripting (@rshura) 
+- #231: Allow setting multiple fields in a single fset command (@rshura)
+- #235: Add json library (encode/decode methods) to lua. (@rshura)
+- 26d0083: Update vendoring to use golang/dep 
+- c8ed7ca: Add WHEREIN command (@rshura)
+- d817814: Optimized network pipelining
+
+### Fixed
+- #237: Flush to file periodically (@rshura)
+- #241: Point match on interior hole (@genesor)
+- 920dc3a: Use atomic ints/bools
+- 730502d: Set keepalive default to 300 seconds
+- 1084c60: Apply limit on top of cursor (@rshura)
+
 ## [1.9.1] - 2017-08-16
 ### Added
 - cd05708: Spatial index optimizations
diff --git a/README.md b/README.md
index 40b7514e..637f61e1 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.9.1-green.svg?" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.10.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 db517f7d..d2ee169e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.9.1"
+VERSION="1.10.0"
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5b25fc9e..246bb675 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4
 
-ENV TILE38_VERSION 1.9.1
+ENV TILE38_VERSION 1.10.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