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

Fixes #18086: Resources changes are not commited in git #3159

Conversation

fanf
Copy link
Member

@fanf fanf commented Aug 3, 2020

@fanf
Copy link
Member Author

fanf commented Aug 3, 2020

PR updated with a new commit

@fanf fanf requested a review from VinceMacBuche August 3, 2020 23:08
@fanf
Copy link
Member Author

fanf commented Aug 3, 2020

Self mergning because we need to build a 6.1.3 pretty quickly.

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder/pull/3159
-- Your faithful QA
Kant merge: "Morality is not the doctrine of how we may make ourselves happy, but how we may make ourselves worthy of happiness."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/28458/console)

@fanf
Copy link
Member Author

fanf commented Aug 3, 2020

OK, squash merging this PR

@fanf fanf force-pushed the bug_18086/resources_changes_are_not_commited_in_git branch from 4fe980d to e40be98 Compare August 3, 2020 23:10
@fanf fanf merged commit e40be98 into Normation:branches/rudder/6.1 Aug 3, 2020
@fanf fanf deleted the bug_18086/resources_changes_are_not_commited_in_git branch March 15, 2024 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants