[openstack-quantum/el6: 2/2] Merge branch 'f18' into el6

[Pádraig Brady]

commit cbf1d7b6041c7f646ac5ec135f8af81ad75d5de7
Merge: cbcc4e6 552c2c7
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Dec 4 01:15:26 2012 +0000

    Merge branch 'f18' into el6
    
    Conflicts:
    	openstack-quantum.spec
    	quantum-dhcp-agent.service
    	quantum-l3-agent.service

 .gitignore                                         |    2 +-
 openstack-quantum.spec                             |   20 ++++++----
 ...-8017d0932c54078e7e18058e78f12c76d68462c7.patch |   37 ++++++++++++++++++++
 sources                                            |    2 +-
 4 files changed, 51 insertions(+), 10 deletions(-)
---
diff --cc openstack-quantum.spec
index ba2ba8b,98747de..ed261bb
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@@ -19,28 -19,16 +19,30 @@@ Source5:	quantum-node-setu
  Source6:	quantum-dhcp-setup
  Source7:	quantum-l3-setup
  
 -Source10:	quantum-server.service
 -Source11:	quantum-linuxbridge-agent.service
 -Source12:	quantum-openvswitch-agent.service
 -Source13:	quantum-ryu-agent.service
 -Source14:	quantum-nec-agent.service
 -Source15:	quantum-dhcp-agent.service
 -Source16:	quantum-l3-agent.service
 +Source10:	quantum-server.init
 +Source20:	quantum-server.upstart
 +Source11:	quantum-linuxbridge-agent.init
 +Source21:	quantum-linuxbridge-agent.upstart
 +Source12:	quantum-openvswitch-agent.init
 +Source22:	quantum-openvswitch-agent.upstart
 +Source13:	quantum-ryu-agent.init
 +Source23:	quantum-ryu-agent.upstart
 +Source14:	quantum-nec-agent.init
 +Source24:	quantum-nec-agent.upstart
 +Source15:	quantum-dhcp-agent.init
 +Source25:	quantum-dhcp-agent.upstart
 +Source16:	quantum-l3-agent.init
 +Source26:	quantum-l3-agent.upstart
 +
 +# This is EPEL specific and not upstream
 +Patch100:         openstack-quantum-newdeps.patch
 +
 +#
 +# patches_base=2012.2
 +#
- Patch0001: 0001-Treat-invalid-namespace-call.patch
+ 
+ # Upstream stable branch patch https://review.openstack.org/17236
+ Patch1:		quantum.git-8017d0932c54078e7e18058e78f12c76d68462c7.patch
  
  BuildArch:	noarch
  
@@@ -216,9 -198,7 +218,9 @@@ networks using multiple other quantum p
  %prep
  %setup -q -n quantum-%{version}
  
- %patch0001 -p1
+ %patch1 -p1
 +# Apply EPEL patch
 +%patch100 -p1
  
  find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
  
@@@ -570,9 -522,12 +569,14 @@@ f
  
  
  %changelog
+ * Mon Dec  3 2012 Robert Kukura <rkukura at redhat.com> - 2012.2.1-1
+ - Update to folsom stable 2012.2.1
 -- Turn off PrivateTmp for dhcp_agent and l3_agent (bug 872689)
+ - Add upstream patch: Fix rpc control_exchange regression.
+ - Remove workaround for missing l3_agent.ini
+ 
 +* Thu Nov 01 2012 Alan Pevec <apevec at redhat.com> 2012.2-2
 +- l3_agent not disabling namespace use lp#1060559
 +
  * Fri Sep 28 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-1
  - Update to folsom final
  - Require python-quantumclient >= 1:2.1.1