Merge "Sahara integration"
authorJenkins <jenkins@review.openstack.org>
Tue, 5 Jan 2016 17:21:35 +0000 (17:21 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 5 Jan 2016 17:21:35 +0000 (17:21 +0000)
1  2 
manifests/loadbalancer.pp

Simple merge