Merge lp:~corey.bryant/horizon/2014.2.1 into lp:~ubuntu-server-dev/horizon/juno

[Corey Bryant]

=== modified file 'debian/README.source'
--- debian/README.source	2014-09-25 12:52:34 +0000
+++ debian/README.source	2014-12-08 17:00:45 +0000
@@ -10,7 +10,7 @@
 Ubuntu main, these assets are bundled up alongside the upstream release tarball
 and are included in the python-django-horizon package under horizon.xstatic.
 
-To refresh the orig-xstatic.tar.gz run:
+To refresh the orig-xstatic.tar.gz and extract it run:
 
     ./debian/rules refresh-xstatic
 

=== modified file 'debian/bundle-xstatic.sh'
--- debian/bundle-xstatic.sh	2014-09-24 21:37:48 +0000
+++ debian/bundle-xstatic.sh	2014-12-08 17:00:45 +0000
@@ -25,4 +25,5 @@
 )
 
 mv  $TMPDIR/lib/horizon_${version}.orig-xstatic.tar.gz ..
+tar xvf ../horizon_${version}.orig-xstatic.tar.gz -C ..
 rm -rf $TMPDIR

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-16 15:01:20 +0000
+++ debian/changelog	2014-12-08 17:00:45 +0000
@@ -1,3 +1,21 @@
+horizon (1:2014.2.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/juno (9e777f2) (LP: #1398952):
+    - [ae7f053] Translation import for 2014.2.1 Juno stable update
+    - [13b0c0e] Prevent leaking `target` info into subsequent `policy.check()` calls
+    - [9144738] Fix dashboard nav, when panelgroup empty
+    - [a2edb3d] Fix Instance Details error when using Cinder V2
+    - [d44c663] Make labels in Network Topology translatable
+    - [ed895a1] Make update metadata segments translatable
+    - [d546faf] Make status in instance details screen translatable
+    - [146a722] Handle negative values in total*Used for Cinder absolute limits
+    - [7dbdd1c] Fix borders for "Actions" column in Firefox
+    - [9e777f2] Update WSGI app creation to be compatible with Django 1.7
+  * d/p/fix-dashboard-django-wsgi.patch: Rebased.
+  * d/bundle-xstatic.sh: Extract tar file after generating it.
+
+ -- Corey Bryant <[e-mail]>  Fri, 05 Dec 2014 13:21:22 -0500
+
 horizon (1:2014.2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.

=== modified file 'debian/patches/fix-dashboard-django-wsgi.patch'
--- debian/patches/fix-dashboard-django-wsgi.patch	2014-09-10 17:03:05 +0000
+++ debian/patches/fix-dashboard-django-wsgi.patch	2014-12-08 17:00:45 +0000
@@ -9,4 +9,4 @@
 +
  DEBUG = False
  
- application = django.core.handlers.wsgi.WSGIHandler()
+ application = get_wsgi_application()