Merge lp:~corey.bryant/neutron/2015.1.1 into lp:~ubuntu-server-dev/neutron/kilo

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-03 17:53:59 +0000
+++ debian/changelog	2015-08-03 20:14:35 +0000
@@ -1,3 +1,65 @@
+neutron (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (1a46332) (LP: #1481008):
+    - [9a23445] When disabling dhcp, delete fixed ip properly
+    - [f9b7c2e] Moving out the cisco n1kv section to stackforge
+    - [478f4e8] Arista ML2 driver should ignore non-vlan networks
+    - [e8bfd4b] dhcp fails if extra_dhcp_opts for stateless subnet enabled
+    - [ae5ffa3] Fix test discovery for api and functional paths
+    - [9f74875] NSX QoS ext: RXTX factor can be decimal
+    - [29c3f7a] In Arista ML2 driver Reconfigure VLAN on VM migration
+    - [c2f2281] Avoid synchronizing session when deleting networkdhcpagentbinding
+    - [71a6b65] Increase max attempts to 2 for pings on ARP tests
+    - [5eff001] Fix failures introduced by the new version of mock
+    - [97448d5] Catch broad exception in methods used in FixedIntervalLoopingCall
+    - [0292876] Fix callback registry notification for security group rule
+    - [86f80d4] Add security groups events
+    - [86584f5] Avoid double-hopping deletes for security group rules
+    - [68459f9] fix DHCP port changed when dhcp-agent restart
+    - [4e2148e] Fix FloatingIP Namespace creation in DVR for Late Binding
+    - [529dbc1] Fix tenant-id in Arista ML2 driver to support HA router
+    - [88d76bc] Skip ARP protection if 0.0.0.0/0 in addr pairs
+    - [469a7ec] Optimize ipset usage in IptablesFirewallDriver
+    - [9ff6138] Provide work around for 0.0.0.0/0 ::/0 for ipset
+    - [b2f717a] Fix l3 agent to not create already deleted router
+    - [151b28c] Wrap ML2 delete_port with db retry decorator
+    - [d71d716] Disable keepalived process in keepalived func test
+    - [cca48ad] Ensure non-overlapping cidrs in subnetpools without galera
+    - [c49c9c5] Check for 'removed' in port_info before reference
+    - [e801eb2] L3 agent should do report state before full sync at start
+    - [415adbf] tests: don't allow oslo.config to autodiscover config files
+    - [2884595] Move pool dispose() before os.fork
+    - [9bc3233] Randomize tunnel id query to avoid contention
+    - [eec77c1] Support BP:ipv6-router in Neutron HA Router
+    - [5407a42] Modify ipset functional tests to pass on older machines
+    - [cf76475] Don't update floating IP status if no change
+    - [81e043f] Don't delete port from bridge on delete_port event
+    - [0c078f2] Block subnet create when a network hosts subnets allocated from different pools
+    - [6bece0f] Create bridges in ovsdb monitor functional tests
+    - [4ee8ac8] Fix the ImportErrors in l3 and dhcp scheduler functional tests
+    - [862e297] ovs-agent: prevent ARP requests with faked IP addresses
+    - [b04ca9e] Support multiple IPv6 prefixes on internal router ports for an HA Router
+    - [c2869b7] OVS-agent: Ignore IPv6 addresses for ARP spoofing prevention
+    - [717cf45] Process port IP requests before subnet requests
+    - [c07687c] Persist DHCP leases to a local database
+    - [8c31107] Block subnet create with mismatched IP versions
+    - [6b127ab] Match order of iptables arguments to iptables-save
+    - [3d0e369] Add block name to switch config options for MLX plug-ins.
+    - [8b32443] Fix neutron tests
+    - [95d0985] Limit router gw ports' stateful fixed IPs to one per address family
+    - [c2860ba] remove router interface on Arista L3 plugin fails
+    - [63c8ea1] Make sure OVS restarts when Exception occurred
+    - [4c9a4bf] Block allowed address pairs on other tenants' net
+    - [a625244] Spawn RADVD only in the master HA router
+    - [1813da4] Router is not unscheduled when the last port is deleted
+    - [1c1981e] Handle no ofport in get_vif_port_to_ofport_map
+    - [74b0d31] Ensure metadata network works with DVR
+    - [58af5e1] Defer creation of router JSON in get_routers RPC
+    - [c4d2b8c] Remove double queries in l3 DB get methods
+    - [1a46332] Set loading strategy to joined for Routerport/Port
+
+ -- Corey Bryant <[e-mail]>  Mon, 03 Aug 2015 14:30:13 -0400
+
 neutron (1:2015.1.0-0ubuntu1) vivid; urgency=medium
 
   [ Corey Bryant ]