From dc9f0cfb2751a18c31432315a43ec716e634a173 Mon Sep 17 00:00:00 2001
From: Chris Larsen <clarsen@yahoo-inc.com>
Date: Sat, 8 Oct 2016 12:06:31 -0700
Subject: [PATCH] Cut Release 2.2.1

---
 NEWS         | 20 +++++++++++++++++++-
 THANKS       |  7 +++++++
 configure.ac |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 14bac38ef2..b3cdd4cddb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 OpenTSDB - User visible changes.
 
-* Version 2.2.1 (2015-?-?)
+* Version 2.2.1 (2016-10-08)
 
 Noteworthy Changes
   - Generate an incrementing TSMeta request only if both enable_tsuid_incrementing and
@@ -8,6 +8,24 @@ Noteworthy Changes
     regardless of whether or not the real time ts setting was enabled. If tsuid 
     incrementing is disabled then a get and optional put is executed each time without 
     modifying the meta counter field.
+  - Improve metadata storage performance by removing an extra getFromStorage() call.
+  - Add global Annotations to the gnuplot graphs (#773)
+  - Allow creation of a TSMeta object without a TSUID (#778)
+  - Move to AsyncHBase 1.7.2
+
+Bug Fixes:
+  - Fix Python scripts to use the environment directory.
+  - Fix config name for "tsd.network.keep_alive" in included config files.
+  - Fix an issue with the filter metric and tag resolution chain during queries.
+  - Fix an issue with malformed, double dotted timestamps (#724).
+  - Fix an issue with tag filters where we need a copy before modifying the list.
+  - Fix comments in the config file around TCP no delay settings.
+  - Fix some query stats calculations around averaging and estimating the number
+    of data points (#784).
+  - Clean out old .SWO files (#821)
+  - Fix a live-lock situation when performing regular expression or wildcard queries (#823).
+  - Change the static file path for the HTTP API to be relative (#857).
+  - Fix an issue where the GUI could flicker when two or more tag filters were set (#708).
 
 * Version 2.2.0 (2016-02-14)
 
diff --git a/THANKS b/THANKS
index 05e9ae58ff..9493ba58e1 100644
--- a/THANKS
+++ b/THANKS
@@ -23,11 +23,14 @@ Cristian Sechel
 Christophe Furmaniak
 Dave Barr <dave.barr@gmail.com>
 Davide D Amico
+Dfsklar
+Ethan Wang
 Filippo Giunchedi <fgiunchedi@gmail.com>
 Gabriel Nicolas Avellaneda
 Guenther Schmuelling <schmuell@pepperdata.com>
 Hari Krishna Dara
 Hong Dai Thanh
+Hugo M Fernandes
 Hugo Trippaers <opensource@strocamp.net>
 Ivan Babrou
 Jacek Masiulaniec <jacek.masiulaniec@gmail.com>
@@ -42,11 +45,13 @@ Johan Zeeck <johan.zeeck@tre.se>
 Johannes Meixner
 Jonathan Works <jonathan.works@threattrack.com>
 Josh Thomas <josh@kickbackpoints.com>
+Kevin Bowling
 Kieren Hynd <kieren.hynd@ticketmaster.co.uk>
 Kimoon Kim <kimoon@pepperdata.com>
 Kris Beevers <beevek@gmail.com>
 Kyle Brandt
 Lex Herbert <lex.herbert@gmail.com>
+Li Zhe
 Liangliang He <heliangliang@xiaomi.com>
 Liu Yubao
 Loïs Burg <burg.lois@gmail.com>
@@ -64,6 +69,7 @@ Nicole Nagele <nicole.nagele@uni-ak.ac.at>
 Nikhil Benesch <me@designbynikhil.com>
 Nitin Aggarwal
 Paula Keezer <paula.keezer@gmail.com>
+Peter Edwards
 Peter Gotz <peter.s.goetz@googlemail.com>
 Pradeep Chhetri <pradeep.chhetri89@gmail.com>
 Rajesh G
@@ -81,5 +87,6 @@ Tristan Colgate-McFarlane <tcolgate@gmail.com>
 Tony Landells <tony.landells@gmail.com>
 Utkarsh Bhatnagar
 Vasiliy Kiryanov <vasiliy.kiryanov@gmail.com>
+Vitaliy Fuks
 Yulai Fu
 Zachary Kurey
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 0ca046cf10..c422ff8d93 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.2.1-SNAPSHOT], [opentsdb@googlegroups.com])
+AC_INIT([opentsdb], [2.2.1], [opentsdb@googlegroups.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign])