| commit | 834617a54e41068b0dd2288a574baeac7eb681e9 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Jul 29 16:54:23 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Jul 29 16:54:23 2016 +0000 |
| tree | 7b2a52794b3bfc5e1e93e31eac8a0e2be2bef400 | |
| parent | cfffc8339f4e7e82f0cd2264d12d91bb60eb2609 [diff] | |
| parent | 87af9005c14b2a6617e8104817bf0c02dc9e81b3 [diff] |
Merge "Add an integration for server using neutron"
diff --git a/common/config.py b/common/config.py index b3615d2..3983792 100644 --- a/common/config.py +++ b/common/config.py
@@ -133,7 +133,7 @@ help="Timeout in seconds to wait for connectivity to " "server."), cfg.IntOpt('sighup_timeout', - default=30, + default=120, help="Timeout in seconds to wait for adding or removing child" "process after receiving of sighup signal"), cfg.IntOpt('sighup_config_edit_retries',