Merge lp:~corey.bryant/neutron/2014.1.3 into lp:~ubuntu-server-dev/neutron/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-12 15:06:09 +0000
+++ debian/changelog	2014-10-03 14:42:39 +0000
@@ -1,3 +1,47 @@
+neutron (1:2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (4a0210e) (LP: #1377136):
+    - [3a30d19] Deletes floating ip related connection states
+    - [dd4b77f] Forbid regular users to reset admin-only attrs to default values
+    - [dc2c893] Add delete operations for the ODL MechanismDriver
+    - [b51e2c7] Add missing ml2 plugin to migration 1fcfc149aca4
+    - [a17a500] Don't convert numeric protocol values to int
+    - [3a85946] NSX: Optionally not enforce nat rule match length check
+    - [645f984] Don't spawn metadata-proxy for non-isolated nets
+    - [b464d89] Big Switch: Check for 'id' in port before lookup
+    - [3116ffa] use TRUE in SQL for boolean var
+    - [3520e66] call security_groups_member_updated in port_update
+    - [50e1534] Don't allow user to set firewall rule with port and no protocol
+    - [0061533] BSN: Add context to backend request for debugging
+    - [6de6d61] Improve ODL ML2 Exception Handling
+    - [2a4153d] Send network name and uuid to subnet create
+    - [b5e3c9a] BSN: Allow concurrent reads to consistency DB
+    - [b201432] Big Switch: Retry on 503 errors from backend
+    - [f6c47ee] NSX: log request body to NSX as debug
+    - [97d622a] Fix metadata agent's auth info caching
+    - [255df45] NSX: Correct allowed_address_pair return value on create_port
+    - [5bea041] Neutron should not use the neutronclient utils module for import_class
+    - [d5314e2] Cisco N1kv plugin to send subtype on network profile creation
+    - [f32d1ce] Pass object to policy when finding fields to strip
+    - [8b5f6be] Call policy.init() once per API request
+    - [9a6d811] Perform policy checks only once on list responses
+    - [c48db90] Datacenter moid should not be tuple
+    - [161d465] Allow unsharing a network used as gateway/floatingip
+    - [9574a2f] Add support for router scheduling in Cisco N1kv Plugin
+    - [6f54565] Fix func job hook script permission problems
+    - [ea43103] Add hook scripts for the functional infra job
+    - [8161cb7] Fixes Hyper-V agent issue on Hyper-V 2008 R2
+    - [8e99cfd] Fixes Hyper-V issue due to ML2 RPC versioning
+    - [69f9121] Ensure ip6tables are used only if ipv6 is enabled in kernel
+    - [399b809] Remove explicit dependency on amqplib
+    - [a872143] Clear entries in Cisco N1KV specific tables on rollback
+    - [ad82fad] Verify ML2 type driver exists before calling del
+    - [af2cc98] Big Switch: Only update hash header on success
+    - [b1e5eec] Ignore variable column widths in ovsdb functional tests
+    - [4a0210e] VMWare: don't notify on disassociate_floatingips()
+
+ -- Corey Bryant <[e-mail]>  Fri, 03 Oct 2014 09:51:16 -0400
+
 neutron (1:2014.1.2-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]