tree d8e8af1f298c4e1713d91b5e70e8ce59a4b4f918
parent 9a4a40f2289b03f96d09850493a1529de1d719bd
parent 011d4006ed858b4438efe70512a69b42e52bd76a
author Jenkins <jenkins@review.openstack.org> 1474569603 +0000
committer Gerrit Code Review <review@openstack.org> 1474569603 +0000

Merge "Delete etcd definition from k8s formula - use etcd formula instead"