From 7a6cdbc8dd9d51430e044a4db1680ce58706c96f Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Thu, 16 Jul 2015 12:29:23 -0700
Subject: [PATCH] Introduce ChangeLog

---
 ChangeLog.rst | 6 ++++++
 setup.py      | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 ChangeLog.rst

diff --git a/ChangeLog.rst b/ChangeLog.rst
new file mode 100644
index 0000000..8900aa8
--- /dev/null
+++ b/ChangeLog.rst
@@ -0,0 +1,6 @@
+Change Log
+==========
+New in version 1.2.9
+--------------------
+
+* Introduced PooledClient a thread-safe pool of clients
diff --git a/setup.py b/setup.py
index b1f2404..bfc12be 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,16 @@
 #!/usr/bin/env python
+import os
 
 from setuptools import setup, find_packages
 
 from pymemcache import __version__
 
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+readme = read('README.md')
+changelog = read('ChangeLog.rst')
+
 setup(
     name='pymemcache',
     version=__version__,
@@ -12,7 +19,7 @@ setup(
     packages=find_packages(),
     install_requires=['six'],
     description='A comprehensive, fast, pure Python memcached client',
-    long_description=open('README.md').read(),
+    long_description=readme + '\n' + changelog,
     license='Apache License 2.0',
     url='https://github.com/Pinterest/pymemcache',
     classifiers=[