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 #10681: Complete documentation introduction #326

Merged
merged 1 commit into from May 3, 2017

Conversation

Projects
None yet
3 participants
@amousset

This comment has been minimized.

Show comment
Hide comment
@amousset

amousset May 3, 2017

Contributor

This PR also needs to be rebased.

Contributor

amousset commented May 3, 2017

This PR also needs to be rebased.

@fanf

This comment has been minimized.

Show comment
Hide comment
@fanf

fanf May 3, 2017

Member

PR rebased

Member

fanf commented May 3, 2017

PR rebased

@fanf

This comment has been minimized.

Show comment
Hide comment
@fanf

fanf May 3, 2017

Member

PR rebased

Member

fanf commented May 3, 2017

PR rebased

@Normation-Quality-Assistant

This comment has been minimized.

Show comment
Hide comment
@Normation-Quality-Assistant

Normation-Quality-Assistant May 3, 2017

This PR breaks qa-test

-- stdout -- 
Your branch is up-to-date with 'NRM/branches/rudder/4.1'.
Already up-to-date.
Deleted branch 4.1_test (was 37a6827).
Updating 290ee5a..a622585
[...]
Running merge tests
 $ cd "/var/lib/quality-assistant/rudder-doc" && ./qa-test --merge

-- stderr --
From github.com:fanf/rudder-doc
 * [new branch]      ust_10681/complete_documentation_from_target_config_to_inventory_introduction -> ust_10681/complete_documentation_from_target_config_to_inventory_introduction_pr
Switched to branch 'branches/rudder/4.1'
Switched to a new branch '4.1_test'
make: *** [quicktest] Error 1

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-doc/pull/326 --test to test with upmerging.
After this, you can remove the Ready for merge tag
-- Your faithful QA

Normation-Quality-Assistant commented May 3, 2017

This PR breaks qa-test

-- stdout -- 
Your branch is up-to-date with 'NRM/branches/rudder/4.1'.
Already up-to-date.
Deleted branch 4.1_test (was 37a6827).
Updating 290ee5a..a622585
[...]
Running merge tests
 $ cd "/var/lib/quality-assistant/rudder-doc" && ./qa-test --merge

-- stderr --
From github.com:fanf/rudder-doc
 * [new branch]      ust_10681/complete_documentation_from_target_config_to_inventory_introduction -> ust_10681/complete_documentation_from_target_config_to_inventory_introduction_pr
Switched to branch 'branches/rudder/4.1'
Switched to a new branch '4.1_test'
make: *** [quicktest] Error 1

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-doc/pull/326 --test to test with upmerging.
After this, you can remove the Ready for merge tag
-- Your faithful QA

image::./images/introduction/technique_editor_overview.png[Graphical Technique Editor - the simplest way to build new configuration]

This comment has been minimized.

@amousset

amousset May 3, 2017

Contributor

Missing newline, it is what breaks the tests.

@amousset

amousset May 3, 2017

Contributor

Missing newline, it is what breaks the tests.

@fanf

This comment has been minimized.

Show comment
Hide comment
@fanf

fanf May 3, 2017

Member

PR rebased

Member

fanf commented May 3, 2017

PR rebased

@Normation-Quality-Assistant

This comment has been minimized.

Show comment
Hide comment
@Normation-Quality-Assistant

Normation-Quality-Assistant commented May 3, 2017

OK, merging this PR

@Normation-Quality-Assistant Normation-Quality-Assistant merged commit 30c7a86 into Normation:branches/rudder/4.1 May 3, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment