Merge lp://qastaging/~gandelman-a/ubuntu/quantal/horizon/2012.2.3 into lp://qastaging/~openstack-ubuntu-testing/horizon/folsom

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 132
Merged at revision: 131
Proposed branch: lp://qastaging/~gandelman-a/ubuntu/quantal/horizon/2012.2.3
Merge into: lp://qastaging/~openstack-ubuntu-testing/horizon/folsom
Diff against target: 10433 lines (+5208/-5187)
6 files modified
debian/changelog (+19/-0)
debian/static/openstack-dashboard/css/9feb0b911869.css (+0/-5039)
debian/static/openstack-dashboard/css/c4c329679a2f.css (+5041/-0)
debian/static/openstack-dashboard/js/cd0129f82e58.js (+146/-0)
debian/static/openstack-dashboard/js/d17288657b07.js (+0/-146)
debian/static/openstack-dashboard/manifest.json (+2/-2)
To merge this branch: bzr merge lp://qastaging/~gandelman-a/ubuntu/quantal/horizon/2012.2.3
Reviewer Review Type Date Requested Status
Chuck Short Pending
Review via email: mp+146729@code.qastaging.launchpad.net
To post a comment you must log in.
132. By Adam Gandelman

Fix non-Ubuntu bug references.

133. By Adam Gandelman

debian/static/openstack-dashboard: Recompress static JS and CSS based on
changes applied upstream in stable/folsom.

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