Merge ~bryce/ubuntu/+source/apache2:sru-lp1832182-revert-focal into ubuntu/+source/apache2:ubuntu/focal-devel

Proposed by Bryce Harrington
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: da9e9ce1321ed1ab6fea9229932418b7725e4c25
Proposed branch: ~bryce/ubuntu/+source/apache2:sru-lp1832182-revert-focal
Merge into: ubuntu/+source/apache2:ubuntu/focal-devel
Diff against target: 18 lines (+10/-0) (has conflicts)
1 file modified
debian/changelog (+10/-0)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
Canonical Server Pending
Review via email: mp+410256@code.launchpad.net

Description of the change

Backs out the SRU fix for apache2 graceful, due to performance regressions reported by multiple users
following the update.

The fix is probably going to be straightforward, but we'll need some time to work up a test case matching the
regressed use case.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/apache2-sru-lp1832182-revert

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
1diff --git a/debian/changelog b/debian/changelog
2index fca964f..a59705a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,13 @@
6+<<<<<<< debian/changelog
7+=======
8+apache2 (2.4.41-4ubuntu3.8) focal; urgency=medium
9+
10+ * Revert fix from 2.4.41-4ubuntu3.7, due to performance regression.
11+ (LP: #1832182)
12+
13+ -- Bryce Harrington <bryce@canonical.com> Thu, 14 Oct 2021 09:24:43 -0700
14+
15+>>>>>>> debian/changelog
16 apache2 (2.4.41-4ubuntu3.7) focal; urgency=medium
17
18 * d/apache2ctl: Also use systemd for graceful if it is in use.

Subscribers

People subscribed via source and target branches