Merge "Update websocket service name in config template"
authorJenkins <jenkins@review.openstack.org>
Wed, 12 Oct 2016 12:37:35 +0000 (12:37 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 12 Oct 2016 12:37:35 +0000 (12:37 +0000)

Trivial merge