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

[Adam Gandelman]

Patch refresh.

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-02 14:14:14 +0000
+++ debian/changelog	2013-08-07 11:03:26 +0000
@@ -8,6 +8,7 @@
 
   [ Adam Gandelman ]
   * debian/rules: Limit testr concurrency to 1 CPU.
+  * debian/patches: Refresh.
 
  -- Chuck Short <[e-mail]>  Wed, 31 Jul 2013 16:55:55 +0000
 
 
=== modified file 'debian/patches/ignore-quantum-binaries.patch'
--- debian/patches/ignore-quantum-binaries.patch	2013-07-18 10:32:33 +0000
+++ debian/patches/ignore-quantum-binaries.patch	2013-08-07 11:03:26 +0000
@@ -1,40 +1,42 @@
 Description: Dont install quantum binaries
 Author: Chuck Short <[e-mail]>
 Forwarded: No
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -57,9 +57,7 @@ data_files =
- 	etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
- 	etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini
- scripts = 
--	bin/quantum-rootwrap
- 	bin/neutron-rootwrap
--	bin/quantum-rootwrap-xen-dom0
- 	bin/neutron-rootwrap-xen-dom0
+Index: neutron/setup.cfg
+===================================================================
+--- neutron.orig/setup.cfg	2013-08-07 11:49:07.840006235 +0100
++++ neutron/setup.cfg	2013-08-07 11:52:00.815006317 +0100
+@@ -57,9 +57,7 @@
+     etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
+     etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini
+ scripts =
+-    bin/quantum-rootwrap
+     bin/neutron-rootwrap
+-    bin/quantum-rootwrap-xen-dom0
+     bin/neutron-rootwrap-xen-dom0
  
  [global]
-@@ -87,24 +85,6 @@ console_scripts =
- 	neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
- 	neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
- 	neutron-server = neutron.server:main
--	quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
--	quantum-db-manage = neutron.db.migration.cli:main
--	quantum-debug = neutron.debug.shell:main
--	quantum-dhcp-agent = neutron.agent.dhcp_agent:main
--	quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
--	quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
--	quantum-l3-agent = neutron.agent.l3_agent:main
--	quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
--	quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
--	quantum-metadata-agent = neutron.agent.metadata.agent:main
--	quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
--	quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
--	quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main
--	quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
--	quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
--	quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
--	quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
--	quantum-server = neutron.server:main
- neutron.ml2.type_drivers = 
- 	flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver
- 	local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver
+@@ -87,24 +85,6 @@
+     neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
+     neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
+     neutron-server = neutron.server:main
+-    quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
+-    quantum-db-manage = neutron.db.migration.cli:main
+-    quantum-debug = neutron.debug.shell:main
+-    quantum-dhcp-agent = neutron.agent.dhcp_agent:main
+-    quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
+-    quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
+-    quantum-l3-agent = neutron.agent.l3_agent:main
+-    quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
+-    quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
+-    quantum-metadata-agent = neutron.agent.metadata.agent:main
+-    quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
+-    quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
+-    quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main
+-    quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
+-    quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
+-    quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
+-    quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
+-    quantum-server = neutron.server:main
+ neutron.ml2.type_drivers =
+     flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver
+     local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver