summaryrefslogtreecommitdiffstats
path: root/test_merge.bash
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-14 16:35:13 +0000
committerGerrit Code Review <review@openstack.org>2015-05-14 16:35:13 +0000
commitcbd56fa47fd9fbd8a596acae56028a2bf128fb45 (patch)
treeb81dfb46403fd987177d1a56e35f9f4cf9848cea /test_merge.bash
parent2c6ea075cf0eeeea5cc7cf6ea9b654c325096d32 (diff)
parentada9662b8b92fd4ec925407fd675c7941f6a3267 (diff)
Merge "Use pacemaker::resource::service instead of ::systemd"
Diffstat (limited to 'test_merge.bash')
0 files changed, 0 insertions, 0 deletions