Merge "Remove double include of neutron::server class"
authorJenkins <jenkins@review.openstack.org>
Wed, 25 Jan 2017 22:58:01 +0000 (22:58 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 25 Jan 2017 22:58:01 +0000 (22:58 +0000)

Trivial merge