diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /python/helpers/pydev/pydevd_comm.py | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'python/helpers/pydev/pydevd_comm.py')
-rw-r--r-- | python/helpers/pydev/pydevd_comm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/helpers/pydev/pydevd_comm.py b/python/helpers/pydev/pydevd_comm.py index 9d4f2e78b94d..b4cf585e5cc2 100644 --- a/python/helpers/pydev/pydevd_comm.py +++ b/python/helpers/pydev/pydevd_comm.py @@ -427,7 +427,7 @@ def StartClient(host, port): s = socket(AF_INET, SOCK_STREAM) - MAX_TRIES = 20 + MAX_TRIES = 100 i = 0 while i<MAX_TRIES: try: |