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

Handling systemd restart #78

Merged
merged 1 commit into from
Mar 11, 2018
Merged

Conversation

eHanseJoerg
Copy link
Contributor

Fixes #77 .

Please allow me to suggest this change to ensure that systemd gets reloaded after there was a change in the odoo.service file that defines Odoo as a systemd service. Otherwise, changes to that file won't be recognized.

Please test!

@sebalix
Copy link
Collaborator

sebalix commented Mar 9, 2018

Thank you @eHanseJoerg , nice contribution. I'll do some local tests but the code LGTM.

@sebalix
Copy link
Collaborator

sebalix commented Mar 9, 2018

@eHanseJoerg can you squash your commits into one please?

@eHanseJoerg
Copy link
Contributor Author

@sebalix , I tried according this. I do not know if this is what you were looking for, honestly

@sebalix
Copy link
Collaborator

sebalix commented Mar 11, 2018

@eHanseJoerg yes the command to use was git rebase -i + squash keyword on all your commits excepting the first, but I think you mess up your history here ;) The squash should result in only one commit on the PR, without any merge.
Try that:

On your branch, edit your 4 last commits:
git rebase -i HEAD~4
Then it the list which appears, don't touch your first commit, and mark squash on the others.
Another screen should appears to enter your commit message, your can remove all that stuff and keep the message of the first commit only.
Now that you have rewritten your history on your branch, you can not push without forcing, but it's OK here, its your development branch:
git push -f

If really you don't succeed with these operations, I can include your work myself if you want.

@eHanseJoerg eHanseJoerg force-pushed the handling_systemd_restart branch from 487fb43 to d1b2b13 Compare March 11, 2018 13:33
@eHanseJoerg
Copy link
Contributor Author

Now the build is failing, but the failing checks do not seem to be induced by my changes IMHO

@sebalix
Copy link
Collaborator

sebalix commented Mar 11, 2018

Sometime the build fails because of network access error etc. I relaunched them.

@sebalix
Copy link
Collaborator

sebalix commented Mar 11, 2018

@eHanseJoerg okay it's all green now, thank you for this fix! I merge.

@sebalix sebalix merged commit 65ee869 into OCA:master Mar 11, 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.

2 participants