Openstack Mojo Testing

Merge lp:~chris.macnaughton/openstack-mojo-specs/ntp-update into lp:openstack-mojo-specs

  1. ntp-update
  2. Merge into mojo-openstack-specs
Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 322
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/ntp-update
Merge into: lp:openstack-mojo-specs
Diff against target: 100 lines (+8/-8)
8 files modified
helper/collect/collect-ceph-default (+1/-1)
helper/collect/collect-next-ha (+1/-1)
helper/collect/collect-next-trusty (+1/-1)
helper/collect/collect-next-xenial (+1/-1)
helper/collect/collect-stable-ha (+1/-1)
helper/collect/collect-stable-ha-trusty (+1/-1)
helper/collect/collect-stable-trusty (+1/-1)
helper/collect/collect-stable-xenial (+1/-1)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/ntp-update
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+335037@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Ames (thedac) wrote :

Looks good

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-ceph-default'
2--- helper/collect/collect-ceph-default 2017-09-21 15:16:55 +0000
3+++ helper/collect/collect-ceph-default 2017-12-11 15:36:59 +0000
4@@ -1,4 +1,4 @@
5 ceph cs:~openstack-charmers-next/ceph
6 ceph-mon cs:~openstack-charmers-next/ceph-mon
7 ceph-osd cs:~openstack-charmers-next/ceph-osd
8-ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
9+ntp cs:ntp
10
11=== modified file 'helper/collect/collect-next-ha'
12--- helper/collect/collect-next-ha 2017-09-06 17:15:11 +0000
13+++ helper/collect/collect-next-ha 2017-12-11 15:36:59 +0000
14@@ -14,7 +14,7 @@
15 neutron-openvswitch cs:~openstack-charmers-next/neutron-openvswitch
16 nova-cloud-controller cs:~openstack-charmers-next/nova-cloud-controller
17 nova-compute cs:~openstack-charmers-next/nova-compute
18-ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
19+ntp cs:ntp
20 openstack-dashboard cs:~openstack-charmers-next/openstack-dashboard
21 percona-cluster cs:~openstack-charmers-next/percona-cluster
22 rabbitmq-server cs:~openstack-charmers-next/rabbitmq-server
23
24=== modified file 'helper/collect/collect-next-trusty'
25--- helper/collect/collect-next-trusty 2017-09-06 17:37:08 +0000
26+++ helper/collect/collect-next-trusty 2017-12-11 15:36:59 +0000
27@@ -15,7 +15,7 @@
28 neutron-openvswitch cs:~openstack-charmers-next/neutron-openvswitch
29 nova-cloud-controller cs:~openstack-charmers-next/nova-cloud-controller
30 nova-compute cs:~openstack-charmers-next/nova-compute
31-ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
32+ntp cs:ntp
33 openstack-dashboard cs:~openstack-charmers-next/openstack-dashboard
34 rabbitmq-server cs:~openstack-charmers-next/rabbitmq-server
35 swift-proxy cs:~openstack-charmers-next/swift-proxy
36
37=== modified file 'helper/collect/collect-next-xenial'
38--- helper/collect/collect-next-xenial 2017-09-06 17:15:11 +0000
39+++ helper/collect/collect-next-xenial 2017-12-11 15:36:59 +0000
40@@ -15,7 +15,7 @@
41 neutron-openvswitch cs:~openstack-charmers-next/neutron-openvswitch
42 nova-cloud-controller cs:~openstack-charmers-next/nova-cloud-controller
43 nova-compute cs:~openstack-charmers-next/nova-compute
44-ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
45+ntp cs:ntp
46 openstack-dashboard cs:~openstack-charmers-next/openstack-dashboard
47 rabbitmq-server cs:~openstack-charmers-next/rabbitmq-server
48 swift-proxy cs:~openstack-charmers-next/swift-proxy
49
50=== modified file 'helper/collect/collect-stable-ha'
51--- helper/collect/collect-stable-ha 2017-11-30 14:52:58 +0000
52+++ helper/collect/collect-stable-ha 2017-12-11 15:36:59 +0000
53@@ -14,7 +14,7 @@
54 neutron-openvswitch cs:~openstack-charmers/neutron-openvswitch
55 nova-cloud-controller cs:~openstack-charmers/nova-cloud-controller
56 nova-compute cs:~openstack-charmers/nova-compute
57-ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
58+ntp cs:ntp
59 openstack-dashboard cs:~openstack-charmers/openstack-dashboard
60 percona-cluster cs:~openstack-charmers/percona-cluster
61 rabbitmq-server cs:~openstack-charmers/rabbitmq-server
62
63=== modified file 'helper/collect/collect-stable-ha-trusty'
64--- helper/collect/collect-stable-ha-trusty 2017-09-06 17:15:11 +0000
65+++ helper/collect/collect-stable-ha-trusty 2017-12-11 15:36:59 +0000
66@@ -15,7 +15,7 @@
67 neutron-openvswitch git://github.com/openstack/charm-neutron-openvswitch
68 nova-cloud-controller git://github.com/openstack/charm-nova-cloud-controller
69 nova-compute git://github.com/openstack/charm-nova-compute
70-ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
71+ntp cs:ntp
72 openstack-dashboard git://github.com/openstack/charm-openstack-dashboard
73 percona-cluster git://github.com/openstack/charm-percona-cluster
74 rabbitmq-server git://github.com/openstack/charm-rabbitmq-server
75
76=== modified file 'helper/collect/collect-stable-trusty'
77--- helper/collect/collect-stable-trusty 2017-09-06 17:37:08 +0000
78+++ helper/collect/collect-stable-trusty 2017-12-11 15:36:59 +0000
79@@ -15,7 +15,7 @@
80 neutron-openvswitch cs:~openstack-charmers/neutron-openvswitch
81 nova-cloud-controller cs:~openstack-charmers/nova-cloud-controller
82 nova-compute cs:~openstack-charmers/nova-compute
83-ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
84+ntp cs:ntp
85 openstack-dashboard cs:~openstack-charmers/openstack-dashboard
86 rabbitmq-server cs:~openstack-charmers/rabbitmq-server
87 swift-proxy cs:~openstack-charmers/swift-proxy
88
89=== modified file 'helper/collect/collect-stable-xenial'
90--- helper/collect/collect-stable-xenial 2017-09-06 17:37:08 +0000
91+++ helper/collect/collect-stable-xenial 2017-12-11 15:36:59 +0000
92@@ -15,7 +15,7 @@
93 neutron-openvswitch cs:~openstack-charmers/neutron-openvswitch
94 nova-cloud-controller cs:~openstack-charmers/nova-cloud-controller
95 nova-compute cs:~openstack-charmers/nova-compute
96-ntp git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
97+ntp cs:ntp
98 openstack-dashboard cs:~openstack-charmers/openstack-dashboard
99 rabbitmq-server cs:~openstack-charmers/rabbitmq-server
100 swift-proxy cs:~openstack-charmers/swift-proxy

Subscribers

People subscribed via source and target branches