Merge "Add tunnel timeout for ui proxy container" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 6 Apr 2017 00:20:13 +0000 (00:20 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 6 Apr 2017 00:20:13 +0000 (00:20 +0000)

Trivial merge