Merge lp:~gandelman-a/ubuntu/saucy/neutron/patch_refresh into lp:~ubuntu-server-dev/neutron/havana

Proposed by Adam Gandelman on 2013-08-07
Status: Merged
Approved by: Chuck Short on 2013-08-07
Approved revision: 179
Merged at revision: 179
Proposed branch: lp:~gandelman-a/ubuntu/saucy/neutron/patch_refresh
Merge into: lp:~ubuntu-server-dev/neutron/havana
Diff against target: 93 lines (+38/-35)
2 files modified
debian/changelog (+1/-0)
debian/patches/ignore-quantum-binaries.patch (+37/-35)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/neutron/patch_refresh
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2013-08-07 Pending
Review via email: mp+178936@code.launchpad.net

Description of the change

Patch refresh.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-02 14:14:14 +0000
3+++ debian/changelog 2013-08-07 11:03:26 +0000
4@@ -8,6 +8,7 @@
5
6 [ Adam Gandelman ]
7 * debian/rules: Limit testr concurrency to 1 CPU.
8+ * debian/patches: Refresh.
9
10 -- Chuck Short <zulcss@ubuntu.com> Wed, 31 Jul 2013 16:55:55 +0000
11
12
13=== modified file 'debian/patches/ignore-quantum-binaries.patch'
14--- debian/patches/ignore-quantum-binaries.patch 2013-07-18 10:32:33 +0000
15+++ debian/patches/ignore-quantum-binaries.patch 2013-08-07 11:03:26 +0000
16@@ -1,40 +1,42 @@
17 Description: Dont install quantum binaries
18 Author: Chuck Short <zulcss@ubuntu.com>
19 Forwarded: No
20---- a/setup.cfg
21-+++ b/setup.cfg
22-@@ -57,9 +57,7 @@ data_files =
23- etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
24- etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini
25- scripts =
26-- bin/quantum-rootwrap
27- bin/neutron-rootwrap
28-- bin/quantum-rootwrap-xen-dom0
29- bin/neutron-rootwrap-xen-dom0
30+Index: neutron/setup.cfg
31+===================================================================
32+--- neutron.orig/setup.cfg 2013-08-07 11:49:07.840006235 +0100
33++++ neutron/setup.cfg 2013-08-07 11:52:00.815006317 +0100
34+@@ -57,9 +57,7 @@
35+ etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
36+ etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini
37+ scripts =
38+- bin/quantum-rootwrap
39+ bin/neutron-rootwrap
40+- bin/quantum-rootwrap-xen-dom0
41+ bin/neutron-rootwrap-xen-dom0
42
43 [global]
44-@@ -87,24 +85,6 @@ console_scripts =
45- neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
46- neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
47- neutron-server = neutron.server:main
48-- quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
49-- quantum-db-manage = neutron.db.migration.cli:main
50-- quantum-debug = neutron.debug.shell:main
51-- quantum-dhcp-agent = neutron.agent.dhcp_agent:main
52-- quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
53-- quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
54-- quantum-l3-agent = neutron.agent.l3_agent:main
55-- quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
56-- quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
57-- quantum-metadata-agent = neutron.agent.metadata.agent:main
58-- quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
59-- quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
60-- quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main
61-- quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
62-- quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
63-- quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
64-- quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
65-- quantum-server = neutron.server:main
66- neutron.ml2.type_drivers =
67- flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver
68- local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver
69+@@ -87,24 +85,6 @@
70+ neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
71+ neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
72+ neutron-server = neutron.server:main
73+- quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
74+- quantum-db-manage = neutron.db.migration.cli:main
75+- quantum-debug = neutron.debug.shell:main
76+- quantum-dhcp-agent = neutron.agent.dhcp_agent:main
77+- quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
78+- quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
79+- quantum-l3-agent = neutron.agent.l3_agent:main
80+- quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
81+- quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
82+- quantum-metadata-agent = neutron.agent.metadata.agent:main
83+- quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
84+- quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
85+- quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main
86+- quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
87+- quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
88+- quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
89+- quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
90+- quantum-server = neutron.server:main
91+ neutron.ml2.type_drivers =
92+ flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver
93+ local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver

Subscribers

People subscribed via source and target branches