Merge "Add etcd composable upgrade steps" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Wed, 1 Mar 2017 23:32:37 +0000 (23:32 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 1 Mar 2017 23:32:37 +0000 (23:32 +0000)

Trivial merge