Merge remote-tracking branch 'origin/master' into apple

uber · Nov 17, 2015 · 31915b2 · 31915b2
2 parents 8a1795a + 45c1f7f
commit 31915b2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -19,6 +19,13 @@ Changes by Version
   connection was previously terminated.
 
 
+0.20.1 (2015-11-12)
+-------------------
+
+- Fix bug which prevented requests from being retried if the candidate
+  connection was previously terminated.
+
+
 0.20.0 (2015-11-10)
 -------------------
 

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,12 +1,12 @@
 # Testing and coverage
-pytest<2.8.0
+pytest>=2,<3
 pytest-cov
 pytest-timeout
 pytest-tornado
-pytest-benchmark[histogram]==3.0.0rc1
+pytest-benchmark[histogram]>=3,<4
 
 # Property based tests
-hypothesis-pytest==0.12.0
+hypothesis>=1.14,<2
 
 # Integration test utilities
 sh

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='tchannel',
-    version='0.20.0',
+    version='0.20.2.dev0',
     author=', '.join([
         'Abhinav Gupta',
         'Aiden Scandella',

diff --git a/tchannel/__init__.py b/tchannel/__init__.py
@@ -22,7 +22,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-__version__ = '0.20.1.dev0'
+__version__ = '0.20.2.dev0'
 # Update setup.py when changing this. zest.releaser doesn't support updating
 # both of them yet.