aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-05-05 22:12:03 +0000
committerGerrit Code Review <review@openstack.org>2014-05-05 22:12:03 +0000
commit3ea6b2cbe1ee70d60fa1ebcbf084b390aab8266c (patch)
tree98e723723d2e2f7d8641eafe4a2b622cea6cac3d /tripleo_heat_merge/merge.py
parentf7663a8973a508c8707b3a05621ac1d49eb6d627 (diff)
parentd33a43761e87456d2ee9cf7fbf671a262dde8342 (diff)
Merge "Increase PXE deployment timeout for overcloud"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions