Merge lp:~gandelman-a/ubuntu/raring/quantum/2013.1.2 into lp:~openstack-ubuntu-testing/neutron/grizzly

[Adam Gandelman]

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-04 19:02:32 +0000
+++ debian/changelog	2013-06-07 20:56:27 +0000
@@ -1,8 +1,47 @@
-quantum (1:2013.1.2-0ubuntu1) UNRELEASED; urgency=low
+quantum (2013.1.2-0ubuntu1) raring-proposed; urgency=low
 
   * debian/control: Add version requirement to python-fixtures (>= 0.3.12).
+  * Resynchronize with stable/grizzly (4bac39b2) (LP: #1188788):
+    - [db36434] rootwrap filter for iptables-save/restore incomplete LP: 1156044
+    - [3339f96] dnsmasq returns its own IP as gateway LP: 1170793
+    - [e88a22f] Floodlight/BigSwitch plugin does not return external network
+      attributes on get_network LP: 1180971
+    - [f431117] quantum-netns-cleanup no longer accepts force argument
+      LP: 1180767
+    - [120c166] dnsmasq returns its own IP as gateway LP: 1170793
+    - [c7a02b2] For networks shared beetwen multiple tenants (net-create
+      --shared) there's no 'default' security group LP: 1171997
+    - [c9f640a] update-port error if port does not exist in nvp LP: 1172006
+    - [1359767] too strict version requirement of kombu LP: 1178512
+    - [bc8e9f9] cannot delete default security group after tenants are deleted
+      LP: 1175393
+    - [cd102c3] plugin path for nvp not correct in folsom to grizzly  migration
+      LP: 1180089
+    - [b2c658c] make default transport type configurable nvp LP: 1179759
+    - [e97fdc4] enable_isolated_metadata_proxy should be called only when
+      enable_isolated_metadata enabled LP: 1159015
+    - [cd06e21] nicira plugin: metadata access network management makes
+      unnecessary calls to backend LP: 1176963
+    - [83eae03] Metadata proxy startup can fail when Daemon class doesn't
+      properly match running processes LP: 1177416
+    - [cee43fb] quantum port-create can not detect duplicate IP address
+      LP: 1177277
+    - [59410e6] exception raised on disassociate_floatingips when out of sync
+      LP: 1177176
+    - [d1f1217] L3 & DHCP agents can't kill metadata proxy on RHEL LP: 1178419
+    - [1841ea5] dhcp agent uses root_helper setting from dhcp_agent.ini and
+      quantum.conf LP: 1178003
+    - [6b5c713] Adding virtual devices to namespaces post-creation is not
+      supported under RHEL LP: 1171727
+    - [aabb62f] binding:vif_type set twice in Brocade plugin LP: 1176570
+    - [abf3288] Incorrect logic in OVSQuantumAgent.port_unbound method
+      LP: 1173463
+    - [5a86b4e] Nova and quantum don't close qpid connections after certain
+      error conditions LP: 1172922
+    - [7addf41] rootwrap error in devstack w/quantum from quantum-dhcp
+      LP: 1080846
 
- -- Adam Gandelman <[e-mail]>  Tue, 04 Jun 2013 12:01:46 -0700
+ -- Adam Gandelman <[e-mail]>  Fri, 07 Jun 2013 13:29:16 -0400
 
 quantum (1:2013.1.1-0ubuntu1) raring-proposed; urgency=low