summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2016-07-08 16:15:56 -0700
committerDana Powers <dana.powers@gmail.com>2016-07-08 16:15:56 -0700
commitb1e2a49e548d44e3e07020548f4bb5af02c3a788 (patch)
tree3e0df577b976d5d9fb84524ed6f23673f4ddec06
parentc921b2ac4cec7459f8a84a0583e8892e6b3f2c6f (diff)
downloadkafka-python-b1e2a49e548d44e3e07020548f4bb5af02c3a788.tar.gz
Patch Release 1.2.41.2.4
-rw-r--r--CHANGES.md9
-rw-r--r--docs/changelog.rst11
-rw-r--r--kafka/version.py2
3 files changed, 21 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 24d590d..cc58586 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+# 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)
Patch Improvements
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)
####################
diff --git a/kafka/version.py b/kafka/version.py
index 5a5df3b..daab838 100644
--- a/kafka/version.py
+++ b/kafka/version.py
@@ -1 +1 @@
-__version__ = '1.2.3'
+__version__ = '1.2.4'