From a1f2ffa867a6e11f244bdc08a80bde7b1ede09b4 Mon Sep 17 00:00:00 2001
From: wouter bolsterlee <wouter@bolsterl.ee>
Date: Mon, 3 Apr 2017 23:11:47 +0200
Subject: [PATCH] prepare for 1.1.0 release

---
 NEWS.rst              | 16 ++++++++++++++++
 happybase/_version.py |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/NEWS.rst b/NEWS.rst
index f8e9162..e09c4a9 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -4,6 +4,22 @@ Version history
 .. py:currentmodule:: happybase
 
 
+HappyBase 1.1.0
+---------------
+
+Release date: 2017-04-03
+
+* Set socket timeout unconditionally on ``TSocket``
+  (`#146 <https://github.com/wbolster/happybase/issues/146>`_)
+
+* Add new ‘0.98’ compatibility mode
+  (`#155 <https://github.com/wbolster/happybase/issues/155>`_)
+
+* Add support for reversed scanners
+  (`#67 <https://github.com/wbolster/happybase/issues/67>`_,
+  `#155 <https://github.com/wbolster/happybase/issues/155>`_)
+
+
 HappyBase 1.0.0
 ---------------
 
diff --git a/happybase/_version.py b/happybase/_version.py
index 03c9adc..6f28812 100644
--- a/happybase/_version.py
+++ b/happybase/_version.py
@@ -5,4 +5,4 @@ This module defines the package version for use in __init__.py and
 setup.py.
 """
 
-__version__ = '1.0.0'
+__version__ = '1.1.0'