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

Proposed by Adam Gandelman on 2012-11-30
Status: Merged
Approved by: Chuck Short on 2012-12-03
Approved revision: 130
Merge reported by: Adam Gandelman
Merged at revision: not available
Proposed branch: lp:~gandelman-a/ubuntu/quantal/horizon/2012.2.1
Merge into: lp:~openstack-ubuntu-testing/horizon/folsom
Diff against target: 22 lines (+11/-0)
1 file modified
debian/changelog (+11/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/quantal/horizon/2012.2.1
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers 2012-11-30 Pending
Review via email: mp+137351@code.launchpad.net
To post a comment you must log in.
130. By Adam Gandelman on 2012-12-01

Remove unneeded changelog entry.

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 2012-10-09 19:30:34 +0000
3+++ debian/changelog 2012-12-01 04:25:24 +0000
4@@ -1,3 +1,13 @@
5+horizon (2012.2.1-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * Resynchronize with stable/folsom (da9a19c7) (LP: #1085255):
8+ - [53954a7] Fixes JavaScript count bug in tables.
9+ - [65c2ab8] Edit image popup public checkbox not pulling in value
10+ (LP: #1076216)
11+ - [cb7aa15] Set defaultbranch in .gitreview to stable/folsom
12+
13+ -- Adam Gandelman <adamg@canonical.com> Fri, 30 Nov 2012 14:06:26 -0400
14+
15 horizon (2012.2-0ubuntu2) quantal; urgency=low
16
17 * debian/control: Set strict version requirements between python-django-horizon,
18@@ -395,3 +405,4 @@
19 * rename python-djanog-horizon.postinst to python-django-horizon.postinst
20
21 -- Jamie Strandboge <jamie@ubuntu.com> Fri, 02 Dec 2011 16:21:52 -0600
22+

Subscribers

People subscribed via source and target branches