Merge ~james-page/ubuntu/+source/keystone:master into ~ubuntu-openstack-dev/ubuntu/+source/keystone:master

Proposed by James Page
Status: Merged
Merged at revision: a8c7e6072bab026550c6462b1647212414c16e23
Proposed branch: ~james-page/ubuntu/+source/keystone:master
Merge into: ~ubuntu-openstack-dev/ubuntu/+source/keystone:master
Diff against target: 38 lines (+13/-2)
2 files modified
debian/changelog (+7/-2)
debian/control (+6/-0)
Reviewer Review Type Date Requested Status
Ubuntu OpenStack uploaders Pending
Review via email: mp+459064@code.launchpad.net

Commit message

New upstream snapshot for OpenStack Caracal.

Description of the change

This is an automated merge proposal.

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
diff --git a/debian/changelog b/debian/changelog
index 814624a..04f9e2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
1keystone (2:24.0.0-0ubuntu2) UNRELEASED; urgency=medium1keystone (2:24.0.0+git2024011916.adfa92b4-0ubuntu1) noble; urgency=medium
22
3 [ Corey Bryant ]
3 * d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for4 * d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for
4 caracal.5 caracal.
56
6 -- Corey Bryant <corey.bryant@canonical.com> Tue, 24 Oct 2023 16:18:12 -04007 [ James Page ]
8 * New upstream snapshot for OpenStack Caracal.
9 * d/control: Align (Build-)Depends with upstream.
10
11 -- James Page <james.page@ubuntu.com> Fri, 19 Jan 2024 16:28:10 +0000
712
8keystone (2:24.0.0-0ubuntu1) mantic; urgency=medium13keystone (2:24.0.0-0ubuntu1) mantic; urgency=medium
914
diff --git a/debian/control b/debian/control
index ee16a42..df90f5a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,12 @@ Build-Depends:
15 python3-sphinx (>= 2.0.0),15 python3-sphinx (>= 2.0.0),
16 python3-sphinx-feature-classification (>= 0.3.2),16 python3-sphinx-feature-classification (>= 0.3.2),
17Build-Depends-Indep:17Build-Depends-Indep:
18*** new test-requirements.txt deps (start)
19 NOT_FOUND(postgresql),
20*** new test-requirements.txt deps (end) ***
21*** new doc/requirements.txt deps (start)
22 NOT_FOUND(postgresql),
23*** new doc/requirements.txt deps (end) ***
18 crudini,24 crudini,
19 python3-bashate (>= 0.5.1),25 python3-bashate (>= 0.5.1),
20 python3-bcrypt (>= 3.1.3),26 python3-bcrypt (>= 3.1.3),

Subscribers

People subscribed via source and target branches