Merge "Update puppet-etcd version"
authorJenkins <jenkins@review.openstack.org>
Tue, 25 Apr 2017 13:35:02 +0000 (13:35 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 25 Apr 2017 13:35:02 +0000 (13:35 +0000)

Trivial merge