Merge lp:~fnordahl/openstack-mojo-specs/openstack-mojo-specs-1802-fix-collect-gnocchi into lp:~ost-maintainers/openstack-mojo-specs/openstack-mojo-specs-1802

Proposed by Frode Nordahl
Status: Merged
Merged at revision: 353
Proposed branch: lp:~fnordahl/openstack-mojo-specs/openstack-mojo-specs-1802-fix-collect-gnocchi
Merge into: lp:~ost-maintainers/openstack-mojo-specs/openstack-mojo-specs-1802
Diff against target: 63 lines (+12/-0)
6 files modified
helper/collect/collect-next-ha (+2/-0)
helper/collect/collect-next-trusty (+2/-0)
helper/collect/collect-stable-ha (+2/-0)
helper/collect/collect-stable-ha-trusty (+2/-0)
helper/collect/collect-stable-trusty (+2/-0)
helper/collect/collect-stable-xenial (+2/-0)
To merge this branch: bzr merge lp:~fnordahl/openstack-mojo-specs/openstack-mojo-specs-1802-fix-collect-gnocchi
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Chris MacNaughton Pending
Review via email: mp+340575@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'helper/collect/collect-next-ha'
--- helper/collect/collect-next-ha 2018-02-22 20:09:57 +0000
+++ helper/collect/collect-next-ha 2018-03-04 13:55:26 +0000
@@ -22,3 +22,5 @@
22swift-storage-z1 cs:~openstack-charmers-next/swift-storage22swift-storage-z1 cs:~openstack-charmers-next/swift-storage
23swift-storage-z2 cs:~openstack-charmers-next/swift-storage23swift-storage-z2 cs:~openstack-charmers-next/swift-storage
24swift-storage-z3 cs:~openstack-charmers-next/swift-storage24swift-storage-z3 cs:~openstack-charmers-next/swift-storage
25gnocchi cs:~openstack-charmers-next/gnocchi
26memcached cs:memcached
2527
=== modified file 'helper/collect/collect-next-trusty'
--- helper/collect/collect-next-trusty 2018-02-22 20:09:57 +0000
+++ helper/collect/collect-next-trusty 2018-03-04 13:55:26 +0000
@@ -23,3 +23,5 @@
23swift-storage-z2 cs:~openstack-charmers-next/swift-storage23swift-storage-z2 cs:~openstack-charmers-next/swift-storage
24swift-storage-z3 cs:~openstack-charmers-next/swift-storage24swift-storage-z3 cs:~openstack-charmers-next/swift-storage
25tempest cs:~openstack-charmers-next/tempest25tempest cs:~openstack-charmers-next/tempest
26gnocchi cs:~openstack-charmers-next/gnocchi
27memcached cs:memcached
2628
=== modified file 'helper/collect/collect-stable-ha'
--- helper/collect/collect-stable-ha 2018-02-22 20:09:57 +0000
+++ helper/collect/collect-stable-ha 2018-03-04 13:55:26 +0000
@@ -22,3 +22,5 @@
22swift-storage-z1 cs:~openstack-charmers/swift-storage22swift-storage-z1 cs:~openstack-charmers/swift-storage
23swift-storage-z2 cs:~openstack-charmers/swift-storage23swift-storage-z2 cs:~openstack-charmers/swift-storage
24swift-storage-z3 cs:~openstack-charmers/swift-storage24swift-storage-z3 cs:~openstack-charmers/swift-storage
25gnocchi cs:~openstack-charmers/gnocchi
26memcached cs:memcached
2527
=== modified file 'helper/collect/collect-stable-ha-trusty'
--- helper/collect/collect-stable-ha-trusty 2018-02-22 20:09:57 +0000
+++ helper/collect/collect-stable-ha-trusty 2018-03-04 13:55:26 +0000
@@ -23,3 +23,5 @@
23swift-storage-z1 git://github.com/openstack/charm-swift-storage23swift-storage-z1 git://github.com/openstack/charm-swift-storage
24swift-storage-z2 git://github.com/openstack/charm-swift-storage24swift-storage-z2 git://github.com/openstack/charm-swift-storage
25swift-storage-z3 git://github.com/openstack/charm-swift-storage25swift-storage-z3 git://github.com/openstack/charm-swift-storage
26gnocchi git://github.com/openstack/charm-gnocchi
27memcached cs:memcached
2628
=== modified file 'helper/collect/collect-stable-trusty'
--- helper/collect/collect-stable-trusty 2018-02-22 20:09:57 +0000
+++ helper/collect/collect-stable-trusty 2018-03-04 13:55:26 +0000
@@ -22,5 +22,7 @@
22swift-storage-z1 cs:~openstack-charmers/swift-storage22swift-storage-z1 cs:~openstack-charmers/swift-storage
23swift-storage-z2 cs:~openstack-charmers/swift-storage23swift-storage-z2 cs:~openstack-charmers/swift-storage
24swift-storage-z3 cs:~openstack-charmers/swift-storage24swift-storage-z3 cs:~openstack-charmers/swift-storage
25gnocchi cs:~openstack-charmers/gnocchi
26memcached cs:memcached
25# Tempest charm is basically never stable27# Tempest charm is basically never stable
26tempest cs:~openstack-charmers-next/tempest28tempest cs:~openstack-charmers-next/tempest
2729
=== modified file 'helper/collect/collect-stable-xenial'
--- helper/collect/collect-stable-xenial 2018-02-22 20:09:57 +0000
+++ helper/collect/collect-stable-xenial 2018-03-04 13:55:26 +0000
@@ -22,5 +22,7 @@
22swift-storage-z1 cs:~openstack-charmers/swift-storage22swift-storage-z1 cs:~openstack-charmers/swift-storage
23swift-storage-z2 cs:~openstack-charmers/swift-storage23swift-storage-z2 cs:~openstack-charmers/swift-storage
24swift-storage-z3 cs:~openstack-charmers/swift-storage24swift-storage-z3 cs:~openstack-charmers/swift-storage
25gnocchi cs:~openstack-charmers/gnocchi
26memcached cs:memcached
25# Tempest charm is basically never stable27# Tempest charm is basically never stable
26tempest cs:~openstack-charmers-next/tempest28tempest cs:~openstack-charmers-next/tempest

Subscribers

People subscribed via source and target branches