Merge lp:~gandelman-a/ubuntu/raring/horizon/2013.1.3 into lp:~ubuntu-server-dev/horizon/grizzly

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 154
Proposed branch: lp:~gandelman-a/ubuntu/raring/horizon/2013.1.3
Merge into: lp:~ubuntu-server-dev/horizon/grizzly
Diff against target: 50 lines (+32/-0)
2 files modified
debian/changelog (+30/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/horizon/2013.1.3
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+180206@code.launchpad.net

Description of the change

2013.1.3

To post a comment you must log in.
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
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-10 17:32:58 +0000
+++ debian/changelog 2013-08-14 18:14:18 +0000
@@ -1,3 +1,33 @@
1horizon (1:2013.1.3-0ubuntu1) raring-proposed; urgency=low
2
3 * Resynchronize with stable/grizzly (435d4c8) (LP: #1210447):
4 - [70e403b] Bump stable/grizzly next version to 2013.1.3
5 - [21a4b20] Passed variables in template not translated LP: 1180316
6 - [9fd8ceb] Selenium tests failing with socket timeout error LP: 1100771
7 - [459488c] Deprecation warnings in webserver log LP: 1172222
8 - [47ea680] New keystoneclient properties break testsuite LP: 1196823
9 - [b163c97] Display of port and CIDR network topology labels is messy
10 LP: 1199086
11 - [a1b23d6] Sync pytz from requirements.txt
12 - [16f52c4] Cant disassociate floating IP from instance panel when using
13 Quantum LP: 1158596
14 - [889f240] Unclear error when deleting a Swift container that contains
15 data LP: 1096084
16 - [933b991] 'msgid' format string with unnamed arguments cannot be
17 properly localized in
18 dashboards/project/instances/workflows/create_instance.py LP: 1177629
19 - [d54fd25] Exception when editing (some) Quantum security rules
20 LP: 1165095
21 - [eab3b39] TypeError for cinder problems LP: 1182075
22 - [4a3dbe1] Duplicate Networks in Networking Tab LP: 1170193
23 - [4c7eb79] Handle None display name for boot from volume LP: 1199206
24 - [d6f033c] Test failing due to latest version of openstack_auth
25 LP: 1207599
26 - [435d4c8] grizzly: translation PO files are out-of-date LP: 1207442
27 * debian/control: Set Vcs fields.
28
29 -- Adam Gandelman <adamg@ubuntu.com> Fri, 09 Aug 2013 10:03:06 +0100
30
1horizon (1:2013.1.2-0ubuntu1) raring-proposed; urgency=low31horizon (1:2013.1.2-0ubuntu1) raring-proposed; urgency=low
232
3 * Resynchronize with stable/grizzly (7310ef2d) (LP: #1188788):33 * Resynchronize with stable/grizzly (7310ef2d) (LP: #1188788):
434
=== modified file 'debian/control'
--- debian/control 2013-03-15 12:29:47 +0000
+++ debian/control 2013-08-14 18:14:18 +0000
@@ -14,6 +14,8 @@
14 python-sphinx14 python-sphinx
15Standards-Version: 3.9.315Standards-Version: 3.9.3
16Homepage: http://launchpad.net/horizon16Homepage: http://launchpad.net/horizon
17Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/horizon/grizzly/files
18Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/horizon/grizzly
1719
18Package: python-django-horizon20Package: python-django-horizon
19Section: python21Section: python

Subscribers

People subscribed via source and target branches