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 #16965: bootstrap openscap scala directories #257

Merged

Conversation

fanf
Copy link
Member

@fanf fanf commented Mar 24, 2020

@fanf fanf requested a review from ncharles March 24, 2020 15:24
@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Branch 'master' set up to track remote branch 'master' from 'NRM'.
Your branch is up to date with 'NRM/master'.
Already up to date.
Already up to date.
[...]
From github.com:fanf/rudder-plugins
 * [new branch]      bug_16965/bootstrap_openscap_scala_directories -> bug_16965/bootstrap_openscap_scala_directories_pr
From github.com:Normation/rudder-plugins
   2e7e2be..1ed9c76  branches/rudder/5.0 -> NRM/branches/rudder/5.0
   9bfb1d2..5136478  branches/rudder/6.0 -> NRM/branches/rudder/6.0
   be1edc8..e77342d  master              -> NRM/master
Switched to branch 'master'
Switched to a new branch 'master_test'
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-plugins/pull/257 --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/21965/console)

@fanf
Copy link
Member Author

fanf commented Mar 26, 2020

OK, merging this PR

@fanf fanf merged commit 1b40b02 into Normation:master Mar 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants