Merge "Remove cluster_enabled setting for etcd"
authorJenkins <jenkins@review.openstack.org>
Tue, 4 Apr 2017 19:02:23 +0000 (19:02 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 4 Apr 2017 19:02:23 +0000 (19:02 +0000)

Trivial merge