Merge github.com:grpc/grpc into flaky-timeouts

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
index f6fdc80595..068deb0b17 100755
--- a/tools/run_tests/jobset.py
+++ b/tools/run_tests/jobset.py
@@ -134,7 +134,7 @@ class JobSpec(object):
   """Specifies what to run for a job."""
 
   def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None,
-               cwd=None, shell=False, timeout_seconds=5*60, flake_retries=5):
+               cwd=None, shell=False, timeout_seconds=5*60, flake_retries=0):
     """
     Arguments:
       cmdline: a list of arguments to pass as the command line