summaryrefslogtreecommitdiffstats
path: root/test_merge.bash
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-11-07 08:31:11 +0000
committerGerrit Code Review <review@openstack.org>2013-11-07 08:31:11 +0000
commitdea5f2faacb4c051c77d84959233101fa119919b (patch)
treed4f43a8b6472c64cea2b7323253f540547626a88 /test_merge.bash
parentdf18ea222c606619e7567f8968cbc6d69a5c61c3 (diff)
parentfff47517c03d02b25fcac6ac40bb9c93db53fd9e (diff)
Merge "Drop NeutronNativePXE option from undercloud tmpls"
Diffstat (limited to 'test_merge.bash')
0 files changed, 0 insertions, 0 deletions