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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 201
Proposed branch: lp://staging/~corey.bryant/horizon/2014.1.4
Merge into: lp://staging/~ubuntu-server-dev/horizon/icehouse
Diff against target: 265 lines (+212/-9)
5 files modified
debian/changelog (+22/-0)
debian/patches/fix-dashboard-django-wsgi.patch (+2/-2)
debian/patches/fix-host-listing-live-migration.patch (+182/-0)
debian/patches/fix-requirements.patch (+5/-7)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp://staging/~corey.bryant/horizon/2014.1.4
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+253096@code.staging.launchpad.net
To post a comment you must log in.
201. By Corey Bryant

* Resynchronize with stable/icehouse (b14a2ec) (LP: #1432608):
  - [4f12ca8] Fix metering daily display
  - [e00979e] Use floats instead of integer in memory calculation of admin dashboard
  - [0eef0d8] Removing Moscow's timezone check
  - [c37aafa] Remove the urlquote to arguments passed to reverse
  - [61d09f6] Horizon login page contains DOS attack mechanism
  - [33f2b93] Prevent leaking `target` info into subsequent `policy.check()` calls
  - [a04aa21] Tolerate completely missing floating_ips
  - [ad1a893] Fixing Neutron Subnet Details help text
  - [7dd9ca6] Handle negative values in total*Used for Cinder absolute limits
  - [2b292e8] Workaround for negative vals in total*Used in nova absolute_limits
  - [e5a9037] Update WSGI app creation to be compatible with Django 1.7
  - [b14a2ec] Run router dashboard unit tests by default
* d/p/fix-dashboard-django-wsgi.patch: Rebased
* d/p/fix-requirements.patch: Rebased
* d/p/fix-host-listing-live-migration.patch: Cherry picked from
  https://review.openstack.org/#/c/149621/

Revision history for this message
James Page (james-page) :
review: Approve

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