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

Proposed by Corey Bryant on 2014-06-09
Status: Merged
Merged at revision: 196
Proposed branch: lp:~corey.bryant/horizon/2014.1.1
Merge into: lp:~ubuntu-server-dev/horizon/icehouse
Diff against target: 48 lines (+28/-0)
3 files modified
debian/changelog (+14/-0)
debian/patches/fix-requirements.patch (+13/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~corey.bryant/horizon/2014.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-06-09 Pending
Review via email: mp+222546@code.launchpad.net

Description of the change

Ubuntu Stable Release Update for OpenStack Icehouse

To post a comment you must log in.
lp:~corey.bryant/horizon/2014.1.1 updated on 2014-06-13
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-17 11:23:33 +0000
3+++ debian/changelog 2014-06-13 16:11:32 +0000
4@@ -1,3 +1,17 @@
5+horizon (1:2014.1.1-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (fbd5b2e) (LP: #1328134):
8+ - [e492c7e] Updated from global requirements
9+ - [e5f04c2] Fix pseudo-folder content listing
10+ - [cd2f7dc] add missing references to policy files
11+ - [232b712] Use escapejs filter on JavaScript strings
12+ - [0c3b710] Add missing mock for cinder.default_quota_get
13+ - [7c47ec5] Add logging handler for openstack_auth in the tests
14+ - [306c5ca] Check host is not none in host aggregate page
15+ - [fbd5b2e] Add missing comma in Volume ResourceWrapper class
16+
17+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 09 Jun 2014 15:20:18 -0400
18+
19 horizon (1:2014.1-0ubuntu1) trusty; urgency=medium
20
21 * New upstream release (LP: #1288245).
22
23=== added file 'debian/patches/fix-requirements.patch'
24--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
25+++ debian/patches/fix-requirements.patch 2014-06-13 16:11:32 +0000
26@@ -0,0 +1,13 @@
27+Description: Set min version of six.
28+Author: Corey Bryant <corey.bryant@canonical.com>
29+Forwarded: Not needed.
30+Index: horizon/requirements.txt
31+===================================================================
32+--- horizon.orig/requirements.txt 2014-06-13 10:14:00.816555621 -0400
33++++ horizon/requirements.txt 2014-06-13 11:44:13.180390616 -0400
34+@@ -21,4 +21,4 @@
35+ python-swiftclient>=1.6
36+ python-troveclient>=1.0.3
37+ pytz>=2010h
38+-six>=1.6.0
39++six>=1.5.2
40
41=== modified file 'debian/patches/series'
42--- debian/patches/series 2013-12-29 17:44:29 +0000
43+++ debian/patches/series 2014-06-13 16:11:32 +0000
44@@ -6,3 +6,4 @@
45
46 #fix-ubuntu-tests.patch
47 ubuntu_settings.patch
48+fix-requirements.patch

Subscribers

People subscribed via source and target branches