Merge lp://staging/~1chb1n/openstack-charm-testing/liberty-prep into lp://staging/openstack-charm-testing

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 118
Proposed branch: lp://staging/~1chb1n/openstack-charm-testing/liberty-prep
Merge into: lp://staging/openstack-charm-testing
Diff against target: 889 lines (+313/-296)
23 files modified
bundles/0mq/0mq.yaml (+27/-1)
bundles/baremetal/7-default.yaml (+26/-1)
bundles/baremetal/7-next.yaml (+26/-2)
bundles/dev/nc-lxd-3host.yaml (+1/-1)
bundles/dev/next-ha.yaml (+52/-1)
bundles/dev/next-kilo-testing.yaml (+0/-278)
bundles/dev/two-smoosh.yaml (+1/-2)
bundles/leadership-election/leadership-election.yaml (+26/-0)
bundles/legacy/essex.yaml (+2/-0)
bundles/other/deployer-quick-check.yaml (+27/-1)
bundles/other/mediawikijoompress.yaml (+3/-0)
bundles/other/ubuntu3-dev.yaml (+3/-0)
bundles/other/ubuntu3-lxc.yaml (+3/-0)
bundles/other/ubuntu3.yaml (+3/-0)
bundles/ppc64/powerkvm-fullstack.yaml (+27/-1)
bundles/ppc64/powerkvm-three-unit-method1.yaml (+1/-1)
bundles/ppc64/powerkvm-two-unit-dense.yaml (+27/-1)
bundles/ppc64/ppc64el-two-unit-method1.yaml (+1/-1)
bundles/ppc64/ppc64el-two-unit-method2.yaml (+1/-1)
bundles/source/default.yaml (+1/-1)
bundles/source/next.yaml (+1/-1)
bundles/sparse/default.yaml (+27/-1)
bundles/sparse/next.yaml (+27/-1)
To merge this branch: bzr merge lp://staging/~1chb1n/openstack-charm-testing/liberty-prep
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+265106@code.staging.launchpad.net

Commit message

N-G to Q-G rename in next bundles; Prep for wily/liberty; Switch to pxc.

Description of the change

N-G to Q-G rename in next bundles; Prep for wily/liberty; Switch to pxc.

To post a comment you must log in.
110. By Ryan Beisner

update

111. By Ryan Beisner

rebase, resolve conflicts

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: