Merge ~bryce/ubuntu/+source/apache2:sru-lp1832182-graceful-xenial into ubuntu/+source/apache2:ubuntu/xenial-devel

Proposed by Bryce Harrington
Status: Merged
Approved by: Bryce Harrington
Approved revision: a6873885675d0b34f76c9e7baac224c4f6da79cd
Merge reported by: Christian Ehrhardt 
Merged at revision: a6873885675d0b34f76c9e7baac224c4f6da79cd
Proposed branch: ~bryce/ubuntu/+source/apache2:sru-lp1832182-graceful-xenial
Merge into: ubuntu/+source/apache2:ubuntu/xenial-devel
Diff against target: 80 lines (+43/-3)
2 files modified
debian/apache2ctl (+36/-3)
debian/changelog (+7/-0)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
git-ubuntu developers Pending
Canonical Server Pending
Review via email: mp+393678@code.qastaging.launchpad.net

Description of the change

Backport to xenial of fix from
https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+merge/393426

In bionic and newer, the 'start' command has already been updated to work with systemd, but that fix appears to have not been backported to xenial. (I'm not certain why; guessing it's just an oversight?)

This branch backports that older fix along with this expansion of the fix to also cover the 'graceful' command.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/apache2-sru-lp1832182
SRU: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1832182
Forwarded to Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

n.b. I will be SRUing this branch along with a fix for https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1899611, but doing this MP in isolation for review convenience.

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

This MP only has the changelog commit - forgot something to push?

Revision history for this message
Christian Ehrhardt  (paelzer) :
review: Needs Fixing
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks for catching that. This branch is slightly different from the others in that it didn't have the prior fix for start, and I just forgot to commit the combined changes.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

In regard to the discussion we had in the MPs for newer releases - in Xenial start didn't issue the messages yet. We could now either go:
a) on the SRU let us not add stdout messages to start&graceful
or
b) let us add the same that was added in later releases (matches what is proposed right now)

Should we maybe get an SRU member to comment on their preference before uploading to proposed?

+1 from the MP review POV.

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

I've gone ahead and uploaded it. Since the messages print only for the currently bugged case I don't think the extra verbosity is going to be an issue. But I'll mention it in the SRU to highlight the situation for the SRU reviewer. I'm combining this with the conf file fix for MP 1899611 so there may end up being some discussion on this already.

Thanks again for the reviews.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

This has been merged, pushed to proposed and removed from there again.
Never the less in regard to the MP - this is merged.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches