Merge "Revert "fix branch for openstack cookbooks to stable/liberty""

This commit is contained in:
Jenkins 2016-03-17 15:19:20 +00:00 committed by Gerrit Code Review
commit aeffd17a1d

View File

@ -21,9 +21,7 @@ source 'https://supermarket.chef.io'
if ENV['ZUUL_CHANGES'] && Dir.exist?("../cookbook-openstack-#{cookbook}")
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
else
cookbook "openstack-#{cookbook}",
github: "openstack/cookbook-openstack-#{cookbook}",
branch: 'stable/liberty'
cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}"
end
end