diff options
| author | Kali Kaneko <kali@leap.se> | 2016-05-04 21:50:57 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-05-04 21:50:57 -0400 |
| commit | 7801c5cd50cd6bcbf7eb14ad0e34c4eb70ba9c78 (patch) | |
| tree | 59c5fc1fa50ec07f6c8a22b3e4759057ca9a9882 /src/leap/bitmask/cli/bitmask_cli.py | |
| parent | 245e49dc00b87a9db77e9753d739db64b3268658 (diff) | |
| parent | 54560623ac5c325bebbe627582b3895c3354368a (diff) | |
Merge branch 'develop' into debian/experimental
Diffstat (limited to 'src/leap/bitmask/cli/bitmask_cli.py')
| -rwxr-xr-x | src/leap/bitmask/cli/bitmask_cli.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py index c5bb1b15..c2b1ba71 100755 --- a/src/leap/bitmask/cli/bitmask_cli.py +++ b/src/leap/bitmask/cli/bitmask_cli.py @@ -325,7 +325,7 @@ def send_command(cli): s = get_zmq_connection() - d = s.sendMsg(*data, timeout=20) + d = s.sendMsg(*data, timeout=60) d.addCallback(cb) d.addCallback(lambda x: reactor.stop()) d.addErrback(timeout_handler) |