From b9bef3008c15e52e8202d87077510ab39d733c71 Mon Sep 17 00:00:00 2001
From: Xiaoxin Lu <javascript@yahoo.com>
Date: Wed, 11 Jan 2017 15:51:07 -0500
Subject: [PATCH] 1.2.0 (#555)

* Bump version

* Update changelog.
---
 CHANGELOG.md | 10 +++++++++-
 package.json |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2b7521b..b3a72a9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # kafka-node CHANGELOG
 
-## 2017-1-4, Version 1.1.0
+## 2017-01-11, Version 1.2.0
+
+**Consumer Group Changes**
+
+- Fix issue where an error in a leaving group during close will prevent a consumer from being closed. [#551](https://github.com/SOHU-Co/kafka-node/pull/551)
+- Fix issue with heartbeat where consumer will continue to send heartbeats at regular intervals even when previous ones did not resolve [#547](https://github.com/SOHU-Co/kafka-node/pull/547)
+- Add ability for ConsumerGroup to recover from stale offsets. This is configured by the new `outOfRangeOffset` option which takes same values as `fromOffset`. [#553](https://github.com/SOHU-Co/kafka-node/pull/553)
+
+## 2017-01-04, Version 1.1.0
 
 - Fixed issue with unhandled error while using Offset [#543](https://github.com/SOHU-Co/kafka-node/pull/543)
 - HighLevelConsumer now allows a configurable retry options used for rebalancing this is found under the `rebalanceRetry` option key [#542](https://github.com/SOHU-Co/kafka-node/pull/542)
diff --git a/package.json b/package.json
index 65e64100..290f90dc 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "broker"
   ],
   "bugs": "https://github.com/SOHU-co/kafka-node/issues",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "kafka.js",
   "license": "MIT",
   "dependencies": {