Merge lp:~gnuoy/openstack-mojo-specs/kilo_swift_ha_serial_scaleout into lp:openstack-mojo-specs

Proposed by Liam Young
Status: Merged
Merged at revision: 319
Proposed branch: lp:~gnuoy/openstack-mojo-specs/kilo_swift_ha_serial_scaleout
Merge into: lp:openstack-mojo-specs
Diff against target: 16 lines (+6/-0)
1 file modified
helper/bundles/swift-ha-proxy-phase1.yaml (+6/-0)
To merge this branch: bzr merge lp:~gnuoy/openstack-mojo-specs/kilo_swift_ha_serial_scaleout
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Chris MacNaughton (community) Approve
Review via email: mp+334448@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

Looks good to me

review: Approve
Revision history for this message
Ryan Beisner (1chb1n) wrote :

This broke lint on trunk. Please file a follow-up to resolve.

`make lint` ftw

review: Disapprove
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Lint is good, I had a .swp file locally tainting things. As you were ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/bundles/swift-ha-proxy-phase1.yaml'
2--- helper/bundles/swift-ha-proxy-phase1.yaml 2017-11-23 13:53:35 +0000
3+++ helper/bundles/swift-ha-proxy-phase1.yaml 2017-11-29 13:32:16 +0000
4@@ -78,6 +78,12 @@
5 overrides:
6 openstack-origin: cloud:trusty-liberty
7 source: cloud:trusty-liberty
8+trusty-kilo:
9+ inherits: openstack-services
10+ series: trusty
11+ overrides:
12+ openstack-origin: cloud:trusty-kilo
13+ source: cloud:trusty-kilo
14 trusty-mitaka:
15 inherits: openstack-services
16 series: trusty

Subscribers

People subscribed via source and target branches