Merge ~pelpsi/launchpad-buildd:release-236 into launchpad-buildd:master

Proposed by Simone Pelosi
Status: Merged
Approved by: Simone Pelosi
Approved revision: aae1181a205641346bfba0cce1dea0012be754c3
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pelpsi/launchpad-buildd:release-236
Merge into: launchpad-buildd:master
Diff against target: 37 lines (+4/-4)
2 files modified
debian/changelog (+3/-3)
docs/conf.py (+1/-1)
Reviewer Review Type Date Requested Status
Clinton Fung Approve
Review via email: mp+460671@code.launchpad.net

Commit message

Release version 236

To post a comment you must log in.
Revision history for this message
Clinton Fung (clinton-fung) :
review: Approve

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 3cce517..8bddfae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
1launchpad-buildd (236) UNRELEASED; urgency=medium1launchpad-buildd (236) focal; urgency=medium
22
3 [ Colin Watson ]3 [ Colin Watson ]
4 * Add lxc.cgroup2.* configuration, for compatibility with future4 * Add lxc.cgroup2.* configuration, for compatibility with future
@@ -14,11 +14,11 @@ launchpad-buildd (236) UNRELEASED; urgency=medium
14 * Add support for snap components.14 * Add support for snap components.
15 Snap components are already built by our build jobs but not 15 Snap components are already built by our build jobs but not
16 added to `built files`. 16 added to `built files`.
17 Add `.comp` filetype to the filter in the `gatherResults` function17 Add `.comp` filetype to the filter in `gatherResults` function
18 to process components correctly. 18 to process components correctly.
19 Snap components and `.comp` file type reference: SD14919 Snap components and `.comp` file type reference: SD149
2020
21 -- Colin Watson <cjwatson@ubuntu.com> Thu, 16 Nov 2023 16:06:07 +000021 -- Simone Pelosi <simone.pelosi@canonical.com> Fri, 16 Feb 2024 10:21:07 +0100
2222
23launchpad-buildd (235) focal; urgency=medium23launchpad-buildd (235) focal; urgency=medium
2424
diff --git a/docs/conf.py b/docs/conf.py
index fa1050a..c81ae4d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@ copyright = "2009-2022, Canonical Ltd"
22author = "Launchpad developers"22author = "Launchpad developers"
2323
24# The full version, including alpha/beta/rc tags24# The full version, including alpha/beta/rc tags
25release = "235"25release = "236"
2626
2727
28# -- General configuration ---------------------------------------------------28# -- General configuration ---------------------------------------------------

Subscribers

People subscribed via source and target branches