diff -Nru nova-2014.2~rc2/ChangeLog nova-2014.2/ChangeLog
--- nova-2014.2~rc2/ChangeLog	2014-10-10 09:13:44.000000000 +0000
+++ nova-2014.2/ChangeLog	2014-10-16 11:58:36.000000000 +0000
@@ -1,8 +1,8 @@
 CHANGES
 =======
 
-2014.2.rc2
-----------
+2014.2
+------
 
 * Fix pci_request_id break the upgrade from icehouse to juno
 * Updated translations
diff -Nru nova-2014.2~rc2/debian/changelog nova-2014.2/debian/changelog
--- nova-2014.2~rc2/debian/changelog	2014-10-10 17:43:07.000000000 +0000
+++ nova-2014.2/debian/changelog	2014-10-16 17:44:42.000000000 +0000
@@ -1,3 +1,15 @@
+nova (1:2014.2-0ubuntu1) utopic; urgency=medium
+
+  [ Chuck Short ]
+  * New upstream release.
+
+  [ James Page ]
+  * d/p/neutron-floating-ip-list.patch: Cherry pick proposed fix for
+    missing server uuids in floating-ip-list when using neutron networking
+    (LP: #1380965).
+
+ -- Chuck Short <zulcss@ubuntu.com>  Thu, 16 Oct 2014 13:44:25 -0400
+
 nova (1:2014.2~rc2-0ubuntu1) utopic; urgency=medium
 
   [ Corey Bryant ]
diff -Nru nova-2014.2~rc2/debian/patches/neutron-floating-ip-list.patch nova-2014.2/debian/patches/neutron-floating-ip-list.patch
--- nova-2014.2~rc2/debian/patches/neutron-floating-ip-list.patch	1970-01-01 00:00:00.000000000 +0000
+++ nova-2014.2/debian/patches/neutron-floating-ip-list.patch	2014-10-16 17:44:42.000000000 +0000
@@ -0,0 +1,40 @@
+From 6b40fc8b18d0294ca68cc53aaea158bf622371cf Mon Sep 17 00:00:00 2001
+From: James Page <james.page@ubuntu.com>
+Date: Thu, 16 Oct 2014 09:57:16 +0100
+Subject: [PATCH] Deal with neutron and nova-network data formats
+
+The Floating IP model returned via the Neutron v2 API is different to
+that provided by the Nova Network API; check to see if instance uuid
+is present in the top level of the Floating IP data and use that if
+found.
+
+Resolves missing server uuids in 'nova floating-ip-list' when used
+with Neutron networking.
+
+Change-Id: I82671546e40dbb06a2854d6ff6448beab7bbd763
+Closes-Bug: #1380965
+---
+ nova/api/openstack/compute/contrib/floating_ips.py |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
+index 19a31ae..3d5762c 100644
+--- a/nova/api/openstack/compute/contrib/floating_ips.py
++++ b/nova/api/openstack/compute/contrib/floating_ips.py
+@@ -71,7 +71,12 @@ def _translate_floating_ip_view(floating_ip):
+     except (TypeError, KeyError, AttributeError):
+         result['fixed_ip'] = None
+     try:
+-        result['instance_id'] = floating_ip['fixed_ip']['instance_uuid']
++        # NOTE(jamespage) neutron based data uses a slight different
++        # underlying data format - use that if present
++        if 'instance' in floating_ip:
++            result['instance_id'] = floating_ip['instance']['uuid']
++        else:
++            result['instance_id'] = floating_ip['fixed_ip']['instance_uuid']
+     except (TypeError, KeyError, AttributeError):
+         result['instance_id'] = None
+     return {'floating_ip': result}
+-- 
+1.7.9.5
+
diff -Nru nova-2014.2~rc2/debian/patches/series nova-2014.2/debian/patches/series
--- nova-2014.2~rc2/debian/patches/series	2014-10-10 17:43:07.000000000 +0000
+++ nova-2014.2/debian/patches/series	2014-10-16 17:44:42.000000000 +0000
@@ -3,3 +3,4 @@
 update-run-tests.patch
 skip-ubuntu-tests.patch
 disable-websockify-tests.patch
+neutron-floating-ip-list.patch
diff -Nru nova-2014.2~rc2/nova.egg-info/PKG-INFO nova-2014.2/nova.egg-info/PKG-INFO
--- nova-2014.2~rc2/nova.egg-info/PKG-INFO	2014-10-10 09:13:45.000000000 +0000
+++ nova-2014.2/nova.egg-info/PKG-INFO	2014-10-16 11:58:38.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nova
-Version: 2014.2.rc2
+Version: 2014.2
 Summary: Cloud computing fabric controller
 Home-page: http://www.openstack.org/
 Author: OpenStack
diff -Nru nova-2014.2~rc2/PKG-INFO nova-2014.2/PKG-INFO
--- nova-2014.2~rc2/PKG-INFO	2014-10-10 09:13:46.000000000 +0000
+++ nova-2014.2/PKG-INFO	2014-10-16 11:58:39.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nova
-Version: 2014.2.rc2
+Version: 2014.2
 Summary: Cloud computing fabric controller
 Home-page: http://www.openstack.org/
 Author: OpenStack