Merge "Remove double tcp_listen_options entries for rabbit"
authorJenkins <jenkins@review.openstack.org>
Wed, 26 Oct 2016 16:43:41 +0000 (16:43 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 26 Oct 2016 16:43:41 +0000 (16:43 +0000)

Trivial merge