Merge lp:~zulcss/neutron/2013.1.5 into lp:~ubuntu-server-dev/neutron/grizzly

[Chuck Short]

2013.1.5

[James Page (james-page)]

review: Approve

[lp:~zulcss/neutron/2013.1.5]

153. By Chuck Short on 2014-03-24

* Resynchronize with stable/grizzly (49cd06d) (LP: #1295674):
  - [49cd06d] Fix testcase 'TestPortsV2.test_range_allocation' failed randomly
  - [127a1cc] Fix testcase 'test_create_subnet_with_two_host_routes' failed
  - [c25ef0b] Fix problem with setting SSL protocol in QPid
  - [1939675] Update RPC code from oslo: consumer threads robustness
  - [7b33aba] Fix case error in qpid exchange name. s/Direct/direct/
  - [e2c2fc6] Fix unable to add allow all IPv4/6 security group rule
  - [67d7d9d] Add X-Tenant-ID to metadata request

154. By Chuck Short on 2014-03-24

Fix changelog

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-17 21:10:11 +0000
+++ debian/changelog	2014-03-24 13:15:12 +0000
@@ -1,3 +1,16 @@
+quantum (1:2013.1.5-0ubuntu1~cloud0) precise-grizzly; urgency=low
+
+  * Resynchronize with stable/grizzly (49cd06d) (LP: #1295674):
+    - [49cd06d] Fix testcase 'TestPortsV2.test_range_allocation' failed randomly
+    - [127a1cc] Fix testcase 'test_create_subnet_with_two_host_routes' failed
+    - [c25ef0b] Fix problem with setting SSL protocol in QPid
+    - [1939675] Update RPC code from oslo: consumer threads robustness
+    - [7b33aba] Fix case error in qpid exchange name.  s/Direct/direct/
+    - [e2c2fc6] Fix unable to add allow all IPv4/6 security group rule
+    - [67d7d9d] Add X-Tenant-ID to metadata request
+
+ -- Chuck Short <[e-mail]>  Fri, 21 Mar 2014 13:59:50 -0400
+
 quantum (1:2013.1.4-0ubuntu1) raring-proposed; urgency=low
 
   * Resynchronize with stable/grizzly (c57c0fa) (LP: #1241202):