From b1e2a49e548d44e3e07020548f4bb5af02c3a788 Mon Sep 17 00:00:00 2001
From: Dana Powers <dana.powers@gmail.com>
Date: Fri, 8 Jul 2016 16:15:56 -0700
Subject: Patch Release 1.2.4

---
 docs/changelog.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'docs')

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ff4e887..0e1632e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+1.2.4 (July 8, 2016)
+####################
+
+Bugfixes
+--------
+* Update consumer_timeout_ms docstring - KafkaConsumer raises StopIteration, no longer ConsumerTimeout
+* Use explicit subscription state flag to handle seek() during message iteration
+* Fix consumer iteration on compacted topics (dpkp PR 752)
+* Support ssl_password config when loading cert chains (amckemie PR 750)
+
+
 1.2.3 (July 2, 2016)
 ####################
 
-- 
cgit v1.2.1