Openstack Mojo Testing

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

  1. openstack-mojo-specs-1802-fix-collect-gnocchi
  2. Merge into 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
1=== modified file 'helper/collect/collect-next-ha'
2--- helper/collect/collect-next-ha 2018-02-22 20:09:57 +0000
3+++ helper/collect/collect-next-ha 2018-03-04 13:55:26 +0000
4@@ -22,3 +22,5 @@
5 swift-storage-z1 cs:~openstack-charmers-next/swift-storage
6 swift-storage-z2 cs:~openstack-charmers-next/swift-storage
7 swift-storage-z3 cs:~openstack-charmers-next/swift-storage
8+gnocchi cs:~openstack-charmers-next/gnocchi
9+memcached cs:memcached
10
11=== modified file 'helper/collect/collect-next-trusty'
12--- helper/collect/collect-next-trusty 2018-02-22 20:09:57 +0000
13+++ helper/collect/collect-next-trusty 2018-03-04 13:55:26 +0000
14@@ -23,3 +23,5 @@
15 swift-storage-z2 cs:~openstack-charmers-next/swift-storage
16 swift-storage-z3 cs:~openstack-charmers-next/swift-storage
17 tempest cs:~openstack-charmers-next/tempest
18+gnocchi cs:~openstack-charmers-next/gnocchi
19+memcached cs:memcached
20
21=== modified file 'helper/collect/collect-stable-ha'
22--- helper/collect/collect-stable-ha 2018-02-22 20:09:57 +0000
23+++ helper/collect/collect-stable-ha 2018-03-04 13:55:26 +0000
24@@ -22,3 +22,5 @@
25 swift-storage-z1 cs:~openstack-charmers/swift-storage
26 swift-storage-z2 cs:~openstack-charmers/swift-storage
27 swift-storage-z3 cs:~openstack-charmers/swift-storage
28+gnocchi cs:~openstack-charmers/gnocchi
29+memcached cs:memcached
30
31=== modified file 'helper/collect/collect-stable-ha-trusty'
32--- helper/collect/collect-stable-ha-trusty 2018-02-22 20:09:57 +0000
33+++ helper/collect/collect-stable-ha-trusty 2018-03-04 13:55:26 +0000
34@@ -23,3 +23,5 @@
35 swift-storage-z1 git://github.com/openstack/charm-swift-storage
36 swift-storage-z2 git://github.com/openstack/charm-swift-storage
37 swift-storage-z3 git://github.com/openstack/charm-swift-storage
38+gnocchi git://github.com/openstack/charm-gnocchi
39+memcached cs:memcached
40
41=== modified file 'helper/collect/collect-stable-trusty'
42--- helper/collect/collect-stable-trusty 2018-02-22 20:09:57 +0000
43+++ helper/collect/collect-stable-trusty 2018-03-04 13:55:26 +0000
44@@ -22,5 +22,7 @@
45 swift-storage-z1 cs:~openstack-charmers/swift-storage
46 swift-storage-z2 cs:~openstack-charmers/swift-storage
47 swift-storage-z3 cs:~openstack-charmers/swift-storage
48+gnocchi cs:~openstack-charmers/gnocchi
49+memcached cs:memcached
50 # Tempest charm is basically never stable
51 tempest cs:~openstack-charmers-next/tempest
52
53=== modified file 'helper/collect/collect-stable-xenial'
54--- helper/collect/collect-stable-xenial 2018-02-22 20:09:57 +0000
55+++ helper/collect/collect-stable-xenial 2018-03-04 13:55:26 +0000
56@@ -22,5 +22,7 @@
57 swift-storage-z1 cs:~openstack-charmers/swift-storage
58 swift-storage-z2 cs:~openstack-charmers/swift-storage
59 swift-storage-z3 cs:~openstack-charmers/swift-storage
60+gnocchi cs:~openstack-charmers/gnocchi
61+memcached cs:memcached
62 # Tempest charm is basically never stable
63 tempest cs:~openstack-charmers-next/tempest

Subscribers

People subscribed via source and target branches