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
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-17 04:59:01 +0000
+++ debian/changelog 2013-08-14 18:14:03 +0000
@@ -1,3 +1,22 @@
1keystone (1:2013.1.3-0ubuntu1) raring-proposed; urgency=low
2
3 * Dropped patches, applied upstream:
4 - debian/patches/CVE-2013-2157.patch: [c100fd2]
5 * Resynchronize with stable/grizzly (f60f742) (LP: #1210447):
6 - [4b22c02] Bump stable/grizzly next version to 2013.1.3
7 - [c100fd2] Force simple Bind for authentication
8 - [b426022] password in clear in keystone.log LP: 1166697
9 - [8ea8024] Performance issue when delete tokens for users LP: 1178063
10 - [76a94c6] Editing User fails when the user already has a Primary Project
11 LP: 1161963
12 - [27a5b42] User roles are replaced by group roles in v3 tokens
13 LP: 1197874
14 - [f60f742] Unscoped tokens are revoked when assigning a role to a user
15 LP: 1170186
16 * debian/control: Update Vcs field.
17
18 -- Adam Gandelman <adamg@ubuntu.com> Fri, 09 Aug 2013 10:06:27 +0100
19
1keystone (1:2013.1.2-0ubuntu2) raring-proposed; urgency=low20keystone (1:2013.1.2-0ubuntu2) raring-proposed; urgency=low
221
3 * Rebased to include latest security updates:22 * Rebased to include latest security updates:
@@ -637,4 +656,3 @@
637 * Initial upload.656 * Initial upload.
638657
639 -- Soren Hansen <soren@ubuntu.com> Wed, 25 May 2011 15:57:15 +0200658 -- Soren Hansen <soren@ubuntu.com> Wed, 25 May 2011 15:57:15 +0200
640
641659
=== modified file 'debian/control'
--- debian/control 2013-03-20 23:43:33 +0000
+++ debian/control 2013-08-14 18:14:03 +0000
@@ -31,7 +31,8 @@
31Standards-Version: 3.9.331Standards-Version: 3.9.3
32XS-Python-Version: >= 2.632XS-Python-Version: >= 2.6
33Homepage: http://launchpad.net/keystone33Homepage: http://launchpad.net/keystone
34Vcs-Bzr: https://code.launchpad.net/~openstack-ubuntu-testing/keystone/grizzly34Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/keystone/grizzly/files
35Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/keystone/grizzly
3536
36Package: python-keystone37Package: python-keystone
37Architecture: all38Architecture: all

Subscribers

People subscribed via source and target branches