Merge lp:~gandelman-a/ubuntu/raring/quantum/2013.14 into lp:~ubuntu-server-dev/neutron/grizzly

[Adam Gandelman]

Releasing 2013.1.4

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-14 17:48:49 +0000
+++ debian/changelog	2013-10-17 21:14:26 +0000
@@ -1,3 +1,27 @@
+quantum (1:2013.1.4-0ubuntu1) raring-proposed; urgency=low
+
+  * Resynchronize with stable/grizzly (c57c0fa) (LP: #1241202):
+    - [043837e] _retrieve_extra_groups in Nicira plugin incompatible with
+      oslo.config >= 1.2.0 LP: 1200609
+    - [a150dc6] dhcp-agent network namespace does not have a default route,
+      can't use upstream dns LP: 1181378
+    - [be16384] Cisco plugin (grizzly) device connection errors LP: 1212834
+    - [045c0b0] Cisco plugin (grizzly) does not pass proper args LP: 1213147
+    - [5bb6b60] metadata network handling causes stacktrace in nvp plugin
+      LP: 1216110
+    - [85c92b0] Nicira plugin: get_port reports wrong port status for extended
+      switches LP: 1188652
+    - [4601b14] Hyper-V agent does not report the correct exception when the
+      network type is set to GRE LP: 1224583
+    - [8180381] Multiple  Neutron operations  using a script fails on Brocade
+      Plugin LP: 1223754
+    - [06f7e75] Neutron network delete fails with brocade plugin LP: 1223747
+    - [1ca02f6] nec-agent: port_added message can be dropped when RPC timeout
+      occurs LP: 1235111
+    - [c57c0fa] make nvp plugin future version friendly LP: 1217479
+
+ -- Adam Gandelman <[e-mail]>  Thu, 17 Oct 2013 13:53:32 -0700
+
 quantum (1:2013.1.3-0ubuntu1) raring-proposed; urgency=low
 
   * Resynchronize with stable/grizzly (06f679d) (LP: #1210447):
@@ -561,3 +585,4 @@
   * Initial release.
 
  -- Chuck Short <[e-mail]>  Fri, 18 Nov 2011 15:29:53 -0500
+