OpenStack Identity (keystone)

Merge lp:~corey.bryant/keystone/2014.1.3-2 into lp:~ubuntu-server-dev/keystone/icehouse

  1. 2014.1.3-2
  2. Merge into icehouse
Proposed by Corey Bryant
Status: Merged
Approved by: Chuck Short
Approved revision: 280
Merged at revision: 280
Proposed branch: lp:~corey.bryant/keystone/2014.1.3-2
Merge into: lp:~ubuntu-server-dev/keystone/icehouse
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~corey.bryant/keystone/2014.1.3-2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+238002@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-10-06 13:08:43 +0000
+++ debian/changelog 2014-10-10 15:25:04 +0000
@@ -1,3 +1,10 @@
1keystone (1:2014.1.3-0ubuntu2) UNRELEASED; urgency=medium
2
3 [ Edward Hope-Morley ]
4 * Added python-ldap as install dep (LP: #1364854)
5
6 -- Corey Bryant <corey.bryant@canonical.com> Fri, 10 Oct 2014 09:02:37 -0400
7
1keystone (1:2014.1.3-0ubuntu1) trusty; urgency=medium8keystone (1:2014.1.3-0ubuntu1) trusty; urgency=medium
29
3 [ Corey Bryant ]10 [ Corey Bryant ]
411
=== modified file 'debian/control'
--- debian/control 2014-03-30 17:28:06 +0000
+++ debian/control 2014-10-10 15:25:04 +0000
@@ -69,6 +69,7 @@
69 python-iso8601,69 python-iso8601,
70 python-keystoneclient (>= 1:0.3.0),70 python-keystoneclient (>= 1:0.3.0),
71 python-kombu (>= 2.4.8),71 python-kombu (>= 2.4.8),
72 python-ldap,
72 python-lockfile,73 python-lockfile,
73 python-lxml,74 python-lxml,
74 python-migrate,75 python-migrate,

Subscribers

People subscribed via source and target branches