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 #16133: Missing diffDisplayer service in 6.0 #2573

Conversation

fanf
Copy link
Member

@fanf fanf commented Nov 6, 2019

Fixes #16133: Missing diffDisplayer service in 6.0
@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Branch 'branches/rudder/6.0' set up to track remote branch 'branches/rudder/6.0' from 'NRM'.
Your branch is up to date with 'NRM/branches/rudder/6.0'.
Already up to date.
Your branch is up to date with 'NRM/branches/rudder/6.0'.
[...]
Switched to a new branch '6.0_test'
+ '[' --merge = --rust ']'
+ '[' --merge = --scala ']'
+ webapp/sources/rudder/rudder-core/src/test/resources/hooks.d/test-hooks.sh
+ export PYTHONPATH=./relay/sources/rudder-pkg/lib/rudder-pkg/:./relay/sources/rudder-pkg/lib:
+ PYTHONPATH=./relay/sources/rudder-pkg/lib/rudder-pkg/:./relay/sources/rudder-pkg/lib:
+ find . '!' -name convertOpenLDAPSchema.py -name '*.py'
+ xargs pylint -E --persistent=n --disable=C,R,import-error,no-member,no-name-in-module
No config file found, using default configuration

You should run ./qa-test in your repository to make sure it works.
You can also run rudder-dev merge https://github.com/Normation/rudder/pull/2573 --test to test with upmerging.
After this, you can remove the qa: Can't merge ta
-- Your faithful QA (https://ci.normation.com/jenkins/job/merge-accepted-pr/16775/console)

@fanf
Copy link
Member Author

fanf commented Nov 6, 2019

OK, squash merging this PR

@fanf fanf merged commit 31328bc into Normation:branches/rudder/6.0 Nov 6, 2019
@fanf fanf deleted the bug_16133/missing_diffdisplayer_service_in_6_0 branch March 15, 2024 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants