Merge lp://staging/~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka into lp://staging/openstack-mojo-specs
Proposed by
Chris MacNaughton
Status: | Merged |
---|---|
Merged at revision: | 271 |
Proposed branch: | lp://staging/~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka |
Merge into: | lp://staging/openstack-mojo-specs |
Diff against target: |
929 lines (+478/-1) 30 files modified
helper/bundles/cephradosgw-ha.yaml (+11/-0) helper/bundles/cephradosgw.yaml (+15/-0) helper/bundles/swift-ha-proxy-phase1.yaml (+14/-0) helper/bundles/swift-ha-proxy-phase2.yaml (+11/-0) helper/bundles/swift-proxy.yaml (+9/-0) helper/collect/collect-cephradosgw (+2/-0) helper/collect/collect-swift-proxy (+1/-1) helper/setup/delete_crm_leader.py (+7/-0) specs/object_storage/ceph_radosgw/ha/liberty/SPEC_INFO.txt (+3/-0) specs/object_storage/ceph_radosgw/ha/liberty/manifest (+34/-0) specs/object_storage/ceph_radosgw/ha/mitaka/SPEC_INFO.txt (+3/-0) specs/object_storage/ceph_radosgw/ha/mitaka/manifest (+34/-0) specs/object_storage/ceph_radosgw/simple_nonha/liberty/SPEC_INFO.txt (+3/-0) specs/object_storage/ceph_radosgw/simple_nonha/liberty/manifest (+19/-0) specs/object_storage/ceph_radosgw/simple_nonha/mitaka/SPEC_INFO.txt (+3/-0) specs/object_storage/ceph_radosgw/simple_nonha/mitaka/manifest (+19/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/SPEC_INFO.txt (+5/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/manifest (+39/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/SPEC_INFO.txt (+5/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/manifest (+39/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/SPEC_INFO.txt (+5/-0) specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/manifest (+39/-0) specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/SPEC_INFO.txt (+3/-0) specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/manifest (+52/-0) specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/SPEC_INFO.txt (+3/-0) specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/manifest (+52/-0) specs/object_storage/swift_proxy/simple_nonha/liberty/SPEC_INFO.txt (+2/-0) specs/object_storage/swift_proxy/simple_nonha/liberty/manifest (+22/-0) specs/object_storage/swift_proxy/simple_nonha/mitaka/SPEC_INFO.txt (+2/-0) specs/object_storage/swift_proxy/simple_nonha/mitaka/manifest (+22/-0) |
To merge this branch: | bzr merge lp://staging/~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Approve | ||
David Ames (community) | Approve | ||
Review via email:
|
To post a comment you must log in.
Please see inline comment re: series.
Also, some minor lint to clean up:
checking helper/ setup/delete_ crm_leader. py setup/delete_ crm_leader. py:19:5: E101 indentation contains mixed spaces and tabs setup/delete_ crm_leader. py:19:5: W191 indentation contains tabs
helper/
helper/