diff options
| author |   imarom <imarom@cisco.com> | 2015-12-15 11:40:35 -0500 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-12-15 11:40:35 -0500 |
| commit | 68bf754b96a84c8a2a32bffab30189f8c8e9ad1b (patch) | |
| tree | 03ed30251c1cc611d888bf62d5c4a8d36566dfd7 /scripts/automation/trex_control_plane/server | |
| parent | 419a25e989c47dcc5e94b9e3bc64252fb5197f10 (diff) | |
| parent | 7b1796d823b38f7c8c801e19c51a4044bc39b17c (diff) | |
Merging lastest 'master' to side branch 'vm'
Conflicts:
scripts/automation/trex_control_plane/console/trex_console.py
Diffstat (limited to 'scripts/automation/trex_control_plane/server')
| -rwxr-xr-x | scripts/automation/trex_control_plane/server/trex_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/automation/trex_control_plane/server/trex_server.py b/scripts/automation/trex_control_plane/server/trex_server.py index 9868d6c8..bf788d35 100755 --- a/scripts/automation/trex_control_plane/server/trex_server.py +++ b/scripts/automation/trex_control_plane/server/trex_server.py @@ -259,7 +259,7 @@ class CTRexServer(object): return False - def start_trex(self, trex_cmd_options, user, block_to_success = True, timeout = 30): + def start_trex(self, trex_cmd_options, user, block_to_success = True, timeout = 40): with self.start_lock: logger.info("Processing start_trex() command.") if self.is_reserved(): |