merge

uber · Sep 4, 2015 · d942897 · d942897
1 parent 9dbb569
commit d942897
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,6 +2,12 @@ Changes by Version
 ==================
 
 
+0.16.2 (unreleased)
+-------------------
+
+- Fix `retry_limit` in `TChannel.call` not allowing 0 retries.
+
+
 0.16.1 (2015-08-27)
 -------------------
 

diff --git a/tchannel/tornado/peer.py b/tchannel/tornado/peer.py
@@ -526,7 +526,9 @@ def send(
             maybe_stream(arg1), maybe_stream(arg2), maybe_stream(arg3)
         )
 
-        retry_limit = retry_limit or DEFAULT_RETRY_LIMIT
+        if retry_limit is None:
+            retry_limit = DEFAULT_RETRY_LIMIT
+
         ttl = ttl or DEFAULT_TIMEOUT
         # hack to get endpoint from arg_1 for trace name
         arg1.close()