summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-08 15:10:47 +0000
committerGerrit Code Review <review@openstack.org>2014-06-08 15:10:47 +0000
commit229a7128b353aa0a1ebcdcc827142695b95794ec (patch)
treed5e66bf14da15dfaba6c90de84f5c68103151657 /etc
parentce1b84d472ae42292b839dfc974268614686fb7f (diff)
parent12791c39059115ff8e27b617e96512ab5231dd26 (diff)
downloadneutron-229a7128b353aa0a1ebcdcc827142695b95794ec.tar.gz
Merge "NSX: bump http_timeout to 30 seconds"
Diffstat (limited to 'etc')
-rw-r--r--etc/neutron/plugins/vmware/nsx.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/neutron/plugins/vmware/nsx.ini b/etc/neutron/plugins/vmware/nsx.ini
index e270df57d6..6ce36c04bf 100644
--- a/etc/neutron/plugins/vmware/nsx.ini
+++ b/etc/neutron/plugins/vmware/nsx.ini
@@ -10,7 +10,7 @@
# req_timeout = 30
# Time before aborting a request on an unresponsive controller
-# http_timeout = 10
+# http_timeout = 30
# Maximum number of times a particular request should be retried
# retries = 2