summaryrefslogtreecommitdiffstats
path: root/merge.py
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-07-09 10:38:03 -0700
committerClint Byrum <clint@fewbar.com>2013-07-09 14:17:39 -0700
commit6529485a2af4075742dd23846a5fef68a9e8bd4c (patch)
tree32fd389528315af0b45956c2a0377535112d3384 /merge.py
parent3c12e51a8470b43f50320316f9dd76617e2e8f11 (diff)
Update bootstack-vm to match undercloud.
Also add Makefile stanza to produce overcoud.yaml from bootstack-vm and nova-compute-group. This should allow independent usage of nova-compute-group without having to manually update overcloud. Change-Id: Id2bd20596e6be887b55019fdad31e6b0f4762eb7
Diffstat (limited to 'merge.py')
0 files changed, 0 insertions, 0 deletions