Merge lp://staging/~1chb1n/openstack-charm-testing/metal-demo into lp://staging/openstack-charm-testing
Proposed by
Ryan Beisner
| Status: | Merged |
|---|---|
| Merged at revision: | 130 |
| Proposed branch: | lp://staging/~1chb1n/openstack-charm-testing/metal-demo |
| Merge into: | lp://staging/openstack-charm-testing |
| Diff against target: |
349 lines (+332/-0) (has conflicts) 2 files modified
bundles/dev/11-default.yaml (+257/-0) demos/maas-tag-example-deploy.sh (+75/-0) Text conflict in bundles/dev/11-default.yaml |
| To merge this branch: | bzr merge lp://staging/~1chb1n/openstack-charm-testing/metal-demo |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charm Testing Maintainers | Pending | ||
|
Review via email:
|
|||
Description of the change
Add demos dir, 11 machine bare metal maas tag example bundle.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
