Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PUP-8495) Systemd support, Ubuntu 17.04 and 17.10 #6694

Closed
wants to merge 1 commit into from

Conversation

kbarmen
Copy link
Contributor

@kbarmen kbarmen commented Mar 1, 2018

And prepare Puppet for Ubuntu 18.04 and 18.10.

@puppetlabs-jenkins
Copy link
Collaborator

Can one of the admins verify this patch?

@puppetcla
Copy link

Waiting for CLA signature by @kbarmen

@kbarmen - We require a Contributor License Agreement (CLA) for people who contribute to Puppet, but we have an easy click-through license with instructions, which is available at https://cla.puppet.com/

Note: if your contribution is trivial and you think it may be exempt from the CLA, please post a short reply to this comment with details. http://docs.puppet.com/community/trivial_patch_exemption.html

@melissa melissa self-assigned this Mar 1, 2018
@melissa
Copy link
Contributor

melissa commented Mar 1, 2018

Thank you for the contribution @kbarmen !

It looks like you have references to 18.04 and 18.10 in your commit message. Could you update that to reflect that you're adding 17.04 and 17.10 instead?

@kbarmen
Copy link
Contributor Author

kbarmen commented Mar 1, 2018

I do indeed consider the patch very trivial, so no need for CLA.

It is perhaps time to switch to systemd as default for Ubuntu (and Debian), and let upstart only be triggered for older releases. That's a whole other patch though, I'm not fluent in ruby :)

I will try to change my commit message, my git foo is so so.

This is a trivial patch that adds support for Ubuntu 17.04 and 17.10.
@kbarmen
Copy link
Contributor Author

kbarmen commented Mar 2, 2018

Looks like I killed Travis CI :)

@melissa
Copy link
Contributor

melissa commented Mar 2, 2018

Strange, it looks like travis maybe timed out on those jobs. I've restarted them.

I also agree this is a trivial patch, so no need to sign the CLA.

And thank you for updating your commit message! I need to poke around a little more to make sure there's nothing else we need to add before merging this, but it looks good!

@melissa
Copy link
Contributor

melissa commented Mar 2, 2018

Actually, I just noticed this is targeting the master branch. Can you retarget it to the 4.10.x branch? That way we can get this change in 4.10.x if we ever do another release for that series, plus all future releases in 5.x

@kbarmen kbarmen changed the base branch from master to 4.10.x March 2, 2018 19:31
@kbarmen kbarmen changed the base branch from 4.10.x to master March 2, 2018 19:32
@kbarmen
Copy link
Contributor Author

kbarmen commented Mar 2, 2018

Oboy, this is a git workshop for me :)
To avoid merge conflicts, I'll make a new pull request for 4.10.x

@melissa
Copy link
Contributor

melissa commented Mar 2, 2018

Git is a process. You can use git cherry-pick 9a82ae7e1e40eec2df3e27ff26cb4802bde5dee7 to bring just this commit to the branch you want rather than re-writing everything

@melissa
Copy link
Contributor

melissa commented Mar 2, 2018

I'm closing this PR in favor of #6706

@melissa melissa closed this Mar 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants