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

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 198
Proposed branch: lp:~gandelman-a/ubuntu/raring/keystone/2013.1.3
Merge into: lp:~ubuntu-server-dev/keystone/grizzly
Diff against target: 45 lines (+21/-2)
2 files modified
debian/changelog (+19/-1)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/keystone/2013.1.3
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+180205@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-17 04:59:01 +0000
3+++ debian/changelog 2013-08-14 18:14:03 +0000
4@@ -1,3 +1,22 @@
5+keystone (1:2013.1.3-0ubuntu1) raring-proposed; urgency=low
6+
7+ * Dropped patches, applied upstream:
8+ - debian/patches/CVE-2013-2157.patch: [c100fd2]
9+ * Resynchronize with stable/grizzly (f60f742) (LP: #1210447):
10+ - [4b22c02] Bump stable/grizzly next version to 2013.1.3
11+ - [c100fd2] Force simple Bind for authentication
12+ - [b426022] password in clear in keystone.log LP: 1166697
13+ - [8ea8024] Performance issue when delete tokens for users LP: 1178063
14+ - [76a94c6] Editing User fails when the user already has a Primary Project
15+ LP: 1161963
16+ - [27a5b42] User roles are replaced by group roles in v3 tokens
17+ LP: 1197874
18+ - [f60f742] Unscoped tokens are revoked when assigning a role to a user
19+ LP: 1170186
20+ * debian/control: Update Vcs field.
21+
22+ -- Adam Gandelman <adamg@ubuntu.com> Fri, 09 Aug 2013 10:06:27 +0100
23+
24 keystone (1:2013.1.2-0ubuntu2) raring-proposed; urgency=low
25
26 * Rebased to include latest security updates:
27@@ -637,4 +656,3 @@
28 * Initial upload.
29
30 -- Soren Hansen <soren@ubuntu.com> Wed, 25 May 2011 15:57:15 +0200
31-
32
33=== modified file 'debian/control'
34--- debian/control 2013-03-20 23:43:33 +0000
35+++ debian/control 2013-08-14 18:14:03 +0000
36@@ -31,7 +31,8 @@
37 Standards-Version: 3.9.3
38 XS-Python-Version: >= 2.6
39 Homepage: http://launchpad.net/keystone
40-Vcs-Bzr: https://code.launchpad.net/~openstack-ubuntu-testing/keystone/grizzly
41+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/keystone/grizzly/files
42+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/keystone/grizzly
43
44 Package: python-keystone
45 Architecture: all

Subscribers

People subscribed via source and target branches