Merge "Parametrize and increase default of swift-proxy node_timeout"
authorJenkins <jenkins@review.openstack.org>
Fri, 8 Jul 2016 09:47:49 +0000 (09:47 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 8 Jul 2016 09:47:49 +0000 (09:47 +0000)

Trivial merge