OpenStack Dashboard (Horizon)

Merge lp://staging/~corey.bryant/horizon/2013.1.5 into lp://staging/~ubuntu-server-dev/horizon/grizzly

Proposed by Corey Bryant on 2014-03-21

Status:

Merged

Approved by:

Chuck Short on 2014-03-24

Approved revision:

156

Merged at revision:

156

Proposed branch:

Merge into:

Diff against target:

1 file modified

debian/changelog (+10/-0)

To merge this branch:

bzr merge lp://staging/~corey.bryant/horizon/2013.1.5

Undecided

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Server Developers		2014-03-21	Pending
Review via email: mp+212225@code.staging.launchpad.net

Ubuntu Stable Release Update for OpenStack Grizzly

156. By Corey Bryant on 2014-03-24: * Resynchronize with stable/grizzly (e6a4653) (LP: #1295674):
  - [e6a4653] Fixing tests to work with keystoneclient 0.6.0
  - [3212dd0] User email is optional and can be absent
  - [117ac2f] Adding management_url to test mock client
  - [b14debc] Fix bug by escaping strings from Nova before displaying them