Merge lp:~corey.bryant/horizon/2014.1.1 into lp:~ubuntu-server-dev/horizon/icehouse

[Corey Bryant]

Ubuntu Stable Release Update for OpenStack Icehouse

[lp:~corey.bryant/horizon/2014.1.1]

196. By Corey Bryant on 2014-06-13

* Resynchronize with stable/icehouse (fbd5b2e) (LP: #1328134):
  - [e492c7e] Updated from global requirements
  - [e5f04c2] Fix pseudo-folder content listing
  - [cd2f7dc] add missing references to policy files
  - [232b712] Use escapejs filter on JavaScript strings
  - [0c3b710] Add missing mock for cinder.default_quota_get
  - [7c47ec5] Add logging handler for openstack_auth in the tests
  - [306c5ca] Check host is not none in host aggregate page
  - [fbd5b2e] Add missing comma in Volume ResourceWrapper class

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-17 11:23:33 +0000
+++ debian/changelog	2014-06-13 16:11:32 +0000
@@ -1,3 +1,17 @@
+horizon (1:2014.1.1-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (fbd5b2e) (LP: #1328134):
+    - [e492c7e] Updated from global requirements
+    - [e5f04c2] Fix pseudo-folder content listing
+    - [cd2f7dc] add missing references to policy files
+    - [232b712] Use escapejs filter on JavaScript strings
+    - [0c3b710] Add missing mock for cinder.default_quota_get
+    - [7c47ec5] Add logging handler for openstack_auth in the tests
+    - [306c5ca] Check host is not none in host aggregate page
+    - [fbd5b2e] Add missing comma in Volume ResourceWrapper class
+
+ -- Corey Bryant <[e-mail]>  Mon, 09 Jun 2014 15:20:18 -0400
+
 horizon (1:2014.1-0ubuntu1) trusty; urgency=medium
 
   * New upstream release (LP: #1288245).
 
=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2014-06-13 16:11:32 +0000
@@ -0,0 +1,13 @@
+Description: Set min version of six.
+Author: Corey Bryant <[e-mail]>
+Forwarded: Not needed.
+Index: horizon/requirements.txt
+===================================================================
+--- horizon.orig/requirements.txt	2014-06-13 10:14:00.816555621 -0400
++++ horizon/requirements.txt	2014-06-13 11:44:13.180390616 -0400
+@@ -21,4 +21,4 @@
+ python-swiftclient>=1.6
+ python-troveclient>=1.0.3
+ pytz>=2010h
+-six>=1.6.0
++six>=1.5.2
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-29 17:44:29 +0000
+++ debian/patches/series	2014-06-13 16:11:32 +0000
@@ -6,3 +6,4 @@
 
 #fix-ubuntu-tests.patch
 ubuntu_settings.patch
+fix-requirements.patch