summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Charriere <nicholascharriere@gmail.com>2017-02-23 09:59:44 -0800
committerGitHub <noreply@github.com>2017-02-23 09:59:44 -0800
commit9b92bb726ae348eb3325bfdd6635d79f1b2813e2 (patch)
tree4f36eacc618ed288c29f411144923adecf678872
parent1db2d1e4fd9a87966a361e16bffc4c55f238a42c (diff)
parent6b728cd7319009ae444ac64a8ec85e8aa0f17ba6 (diff)
downloadpymemcache-9b92bb726ae348eb3325bfdd6635d79f1b2813e2.tar.gz
Merge pull request #143 from pinterest/release-142
Release 142
-rw-r--r--ChangeLog.rst4
-rw-r--r--pymemcache/__init__.py2
-rw-r--r--setup.cfg2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 95f3946..6ee6e9d 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,5 +1,9 @@
Change Log
==========
+New in version 1.4.2
+--------------------
+* Drop support for python 2.6, see [ticket](https://github.com/pinterest/pymemcache/issues/139)
+
New in version 1.4.1
--------------------
* Python 3 serializations [fixes](https://github.com/pinterest/pymemcache/pull/131)
diff --git a/pymemcache/__init__.py b/pymemcache/__init__.py
index f66a4c6..e36ce0a 100644
--- a/pymemcache/__init__.py
+++ b/pymemcache/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '1.4.1'
+__version__ = '1.4.2'
__author__ = "Charles Gordon"
diff --git a/setup.cfg b/setup.cfg
index 2284de6..4bc86b3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 1.4.1
+current_version = 1.4.2
commit = False
tag = True