Merge lp:~zulcss/neutron/2013.2.3 into lp:~ubuntu-server-dev/neutron/havana

[Chuck Short]

2013.2.3

[James Page (james-page)]

Can you check that:

+ - [a75435d] Updated neutronclient dependency

Is not foobaring stuff - but if not then +1

review: Approve

[lp:~zulcss/neutron/2013.2.3]

218. By Chuck Short on 2014-04-04

debian/patches/revert-stable-havana-requirements.patch: Updated not to
bump the version of python-neutronclient.

219. By Chuck Short on 2014-04-04

Clean up changelog

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-31 15:53:15 +0000
+++ debian/changelog	2014-04-04 19:18:41 +0000
@@ -1,6 +1,31 @@
-neutron (1:2013.2.2-0ubuntu2) UNRELEASED; urgency=medium
+neutron (1:2013.2.3-0ubuntu1) saucy-proposed; urgency=medium
 
+  * Resynchronize with stable/havana (8cb9d89) (LP: #1284643):
+    - [8cb9d89] Use a temp dir for CONF.state_path
+    - [566321b] Subnets should be set as lazy='join'
+    - [eb4c045] Qpid, RabbitMQ: advance thru the list of brokers on reconnect
+    - [1faec83] Prevent cross plugging router ports from other tenants
+    - [858ec2e] Fixes Hyper-V port metrics enabling after service restart
+    - [d57ce79] Adds Hyper-V utils methods
+    - [5ccfeae] NSX: Sync do not pass around model object
+    - [7f2c41f] NSX: Fix possible deadlock in sync code
+    - [7871486] Use a more accurate max_delay for reconnects
+    - [8e92741] Adds id in update_floatingip API in PLUMgrid plugin driver
+    - [ab46900] Report proper error message in PLUMgrid Plugin
+    - [ece27c9] Update help message of flag 'enable_isolated_metadata'
+    - [a47fde6] Remove the warning for Scheduling Network
+    - [28ee2ac] vshield task manager: abort tasks in stop() on termination
+    - [c194262] Fix request timeout errors during calls to NSX controller
+    - [2b4cdcd] Fix error while connecting to busy NSX L2 Gateway
+    - [5158744] Tweak version nvp/nsx version validation logic for router operations
+    - [722746f] [ML2] l2-pop MD handle multi create/delete ports
+    - [99339a9] Fix metering iptables driver doesn't read root_helper param
+    - [2e9f5a7] Add support for managing async processes
+    - [5678fb8] fix --excluded of meter-label-rule-create is not working
+    - [c0586c4] Fix a typo in log exception in the metering agent
   * debian/patches/bump-sqlalchemy-versions.patch: Rediffed 
+  * debian/patches/revert-stable-havana-requirements.patch: Updated not to 
+    bump the version of python-neutronclient.
 
  -- Chuck Short <[e-mail]>  Mon, 31 Mar 2014 11:51:57 -0400
 

=== modified file 'debian/patches/revert-stable-havana-requirements.patch'
--- debian/patches/revert-stable-havana-requirements.patch	2013-12-18 19:17:05 +0000
+++ debian/patches/revert-stable-havana-requirements.patch	2014-04-04 19:18:41 +0000
@@ -6,11 +6,10 @@
 were updated in global requirements to fix gating issues and synced
 across projects.
 
-Index: neutron/requirements.txt
-===================================================================
---- neutron.orig/requirements.txt	2013-12-18 11:14:27.591233143 -0800
-+++ neutron/requirements.txt	2013-12-18 11:15:10.331232756 -0800
-@@ -6,12 +6,12 @@
+diff -Naurp neutron-2013.2.3.orig/requirements.txt neutron-2013.2.3/requirements.txt
+--- neutron-2013.2.3.orig/requirements.txt	2014-04-04 14:58:32.555689226 -0400
++++ neutron-2013.2.3/requirements.txt	2014-04-04 15:01:57.823694120 -0400
+@@ -6,16 +6,16 @@ Routes>=1.12.3
  amqplib>=0.6.1
  anyjson>=0.3.3
  argparse
@@ -25,12 +24,8 @@
  Jinja2
  kombu>=2.4.8
  netaddr
-@@ -20,7 +20,7 @@
+-python-neutronclient>=2.3.4,<3
++python-neutronclient>=2.3.0,<3
+ SQLAlchemy>=0.7.8,<=0.8.99
  WebOb>=1.2.3,<1.3
  python-keystoneclient>=0.3.2
- alembic>=0.4.1
--six>=1.4.1
-+six
- stevedore>=0.10
- oslo.config>=1.2.0
-