summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Charriere <nicholascharriere@gmail.com>2016-10-04 10:51:41 -0700
committerGitHub <noreply@github.com>2016-10-04 10:51:41 -0700
commitbfea304918cd0b950566f0c15e6bdcc0e5741364 (patch)
tree93c1452cdea7e9cc8bf8b867cbe3b3ca545a3175
parent1920254beaaf2351555009056addfe5e0201d1eb (diff)
parente1b5606c5d020f4c3b9a8868d3c9b07c5c4aaf6d (diff)
downloadpymemcache-bfea304918cd0b950566f0c15e6bdcc0e5741364.tar.gz
Merge pull request #121 from pinterest/release-138
Release 138
-rw-r--r--ChangeLog.rst5
-rw-r--r--docs/conf.py2
-rw-r--r--pymemcache/__init__.py2
-rw-r--r--setup.cfg2
4 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index e3cbab2..b5846dd 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,5 +1,9 @@
Change Log
==========
+New in version 1.3.8
+--------------------
+* use cpickle instead of pickle when possible (python2)
+
New in version 1.3.7
--------------------
* default parameter on get(key, default=0)
@@ -9,7 +13,6 @@ New in version 1.3.7
* refactor stat parsing
* fix MockMemcacheClient
* fix unicode char in middle of key bug
-* use cpickle instead of pickle when possible (python2)
New in version 1.3.6
--------------------
diff --git a/docs/conf.py b/docs/conf.py
index 1a95bdc..2e360e7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,7 +66,7 @@ author = u'Charles Gordon, Nicholas Charriere'
# The short X.Y version.
version = u'1.3'
# The full version, including alpha/beta/rc tags.
-release = u'1.3.7'
+release = u'1.3.8'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/pymemcache/__init__.py b/pymemcache/__init__.py
index b1ea50b..81e97bb 100644
--- a/pymemcache/__init__.py
+++ b/pymemcache/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '1.3.7'
+__version__ = '1.3.8'
__author__ = "Charles Gordon"
diff --git a/setup.cfg b/setup.cfg
index 989aef8..82d8d51 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 1.3.7
+current_version = 1.3.8
commit = False
tag = True