summaryrefslogtreecommitdiffstats
path: root/test_merge.bash
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-04-05 10:29:31 +0000
committerGerrit Code Review <review@openstack.org>2014-04-05 10:29:31 +0000
commit2e184b20a1f1fae755c275fd256e37a9e99cf715 (patch)
tree792b450ab51e751b16762ac906ae81daae993646 /test_merge.bash
parent65351560a421f40c0d66d6dcb00ee5515d5feb0f (diff)
parentf52b52cadfb70b7dc808a22e3566954ac8e7829c (diff)
Merge "Update templates to default to preserve ephemeral"
Diffstat (limited to 'test_merge.bash')
0 files changed, 0 insertions, 0 deletions