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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 196
Proposed branch: lp://staging/~corey.bryant/horizon/2014.1.1
Merge into: lp://staging/~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://staging/~corey.bryant/horizon/2014.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+222546@code.staging.launchpad.net

Description of the change

Ubuntu Stable Release Update for OpenStack Icehouse

To post a comment you must log in.
196. By Corey Bryant

* 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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches