Merge "Keystone token flushing"
authorJenkins <jenkins@review.openstack.org>
Tue, 28 Jul 2015 07:34:22 +0000 (07:34 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 28 Jul 2015 07:34:22 +0000 (07:34 +0000)
1  2 
puppet/hieradata/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge