Merge "Adds etcd"
authorJenkins <jenkins@review.openstack.org>
Thu, 19 Jan 2017 21:08:34 +0000 (21:08 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 19 Jan 2017 21:08:34 +0000 (21:08 +0000)
1  2 
manifests/haproxy.pp

Simple merge