Merge "Add tunnel timeout for ui proxy container"
authorJenkins <jenkins@review.openstack.org>
Mon, 3 Apr 2017 22:25:10 +0000 (22:25 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 3 Apr 2017 22:25:10 +0000 (22:25 +0000)

Trivial merge