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

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 247
Proposed branch: lp:~gandelman-a/ubuntu/raring/glance/2013.1.3
Merge into: lp:~ubuntu-server-dev/glance/grizzly
Diff against target: 38 lines (+12/-1)
2 files modified
debian/changelog (+10/-1)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/glance/2013.1.3
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+180207@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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-10 17:32:57 +0000
3+++ debian/changelog 2013-08-14 18:14:30 +0000
4@@ -1,3 +1,13 @@
5+glance (1:2013.1.3-0ubuntu1) raring-proposed; urgency=low
6+
7+ * Resynchronize with stable/grizzly (a5dda27) (LP: #1210447):
8+ - [272982c] Bump stable/grizzly next version to 2013.1.3
9+ - [a5dda27] Exception on running glance commands with non-ASCII arguments
10+ LP: 1182824
11+ * debian/control: Set Vcs fields.
12+
13+ -- Adam Gandelman <adamg@ubuntu.com> Fri, 09 Aug 2013 10:02:09 +0100
14+
15 glance (1:2013.1.2-0ubuntu1) raring-proposed; urgency=low
16
17 * Resynchronize with stable/grizzly (a799a98b) (LP: #1188788):
18@@ -397,7 +407,6 @@
19
20 -- Matthias Klose <doko@ubuntu.com> Mon, 02 Jan 2012 13:02:24 +0100
21
22-
23 glance (2012.1~e2-0ubuntu2) precise; urgency=low
24
25 * debian/glance-registry.postinst: Fix typo in postinst.
26
27=== modified file 'debian/control'
28--- debian/control 2013-03-06 20:08:24 +0000
29+++ debian/control 2013-08-14 18:14:30 +0000
30@@ -39,6 +39,8 @@
31 Standards-Version: 3.9.3
32 XS-Python-Version: >= 2.6
33 Homepage: http://launchpad.net/glance
34+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/glance/grizzly/files
35+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/glance/grizzly
36
37 Package: python-glance
38 Architecture: all

Subscribers

People subscribed via source and target branches