Merge branch 'rwsu-selinux-combine'

This commit is contained in:
James Slagle 2014-10-27 07:20:46 -04:00
commit fe6b02af77

View File

@ -59,6 +59,10 @@ function do_tripleo_source_installs {
# Simplify keepalived custom policy
# https://review.openstack.org/130422
cherry_pick tripleo-image-elements refs/changes/22/130422/2
# Multiple custom policy installs in one operation to save
# time
# https://review.openstack.org/130875
cherry_pick tripleo-image-elements refs/changes/75/130875/1
fi