summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md8
-rw-r--r--docs/changelog.rst10
-rw-r--r--kafka/version.py2
3 files changed, 19 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index cc58586..ea32e5f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+# 1.2.5 (July 15, 2016)
+
+Bugfixes
+* Fix bug causing KafkaProducer to double-compress message batches on retry
+* Check for double-compressed messages in KafkaConsumer, log warning and optionally skip
+* Drop recursion in _unpack_message_set; only decompress once
+
+
# 1.2.4 (July 8, 2016)
Bugfixes
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0e1632e..9d89c5f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,16 @@
Changelog
=========
+1.2.5 (July 15, 2016)
+#####################
+
+Bugfixes
+--------
+* Fix bug causing KafkaProducer to double-compress message batches on retry
+* Check for double-compressed messages in KafkaConsumer, log warning and optionally skip
+* Drop recursion in _unpack_message_set; only decompress once
+
+
1.2.4 (July 8, 2016)
####################
diff --git a/kafka/version.py b/kafka/version.py
index 8d508f6..09964d6 100644
--- a/kafka/version.py
+++ b/kafka/version.py
@@ -1 +1 @@
-__version__ = '1.2.5.dev'
+__version__ = '1.2.5'