From 383df1b190d579af1d1bbecd6270ef9f89b2ba79 Mon Sep 17 00:00:00 2001
From: Chris Larsen <clarsen@yahoo-inc.com>
Date: Sat, 12 Sep 2015 12:46:59 -0700
Subject: [PATCH] Release 2.1.1

---
 NEWS         | 9 +++++++++
 THANKS       | 1 +
 configure.ac | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index b45f3dccef..8013e6daf1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 OpenTSDB - User visible changes.
 
+* Version 2.1.1 (2015-09-12)
+
+Bug Fixes:
+  - Relax the pgrep regex to correctly find and kill the java process in the RPM init.d
+    script.
+  - Improve query performance slightly when aggregating multiple series.
+  - Fix the /api/search/lookup API call to properly handle the limit parameter.
+  - Fix the /api/query/last endpoint to properly handle missing tsdb-meta tables.
+
 * Version 2.1.0 (2015-05-06)
 
 Bug Fixes:
diff --git a/THANKS b/THANKS
index b8005c0884..c53931ddea 100644
--- a/THANKS
+++ b/THANKS
@@ -32,6 +32,7 @@ Josh Thomas <josh@kickbackpoints.com>
 Kieren Hynd <kieren.hynd@ticketmaster.co.uk>
 Kimoon Kim <kimoon@pepperdata.com>
 Kris Beevers <beevek@gmail.com>
+Lex Herbert <lex.herbert@gmail.com>
 Liangliang He <heliangliang@xiaomi.com>
 Matt Jibson <matt.jibson@gmail.com>
 Mark Smith <mark@dreamwidth.org>
diff --git a/configure.ac b/configure.ac
index 66ab5753b8..082b2d07b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 # Semantic Versioning (see http://semver.org/).
-AC_INIT([opentsdb], [2.1.0], [opentsdb@googlegroups.com])
+AC_INIT([opentsdb], [2.1.1], [opentsdb@googlegroups.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign])