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.

Sign up for GitHub

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

Jump to bottom

[2018.3] Merge forward from 2017.7 to 2018.3 #48799

Merged
merged 18 commits into from Jul 27, 2018
Merged

[2018.3] Merge forward from 2017.7 to 2018.3 #48799

merged 18 commits into from Jul 27, 2018

Commits on Jul 24, 2018

  1. Fixed enable_vnc runner arg being passed into seed_cmd module arg… 

    … in `virt.init`.
    zer0def committed Jul 24, 2018
    Copy the full SHA
    365ebdf View commit details
    Browse the repository at this point in the history

  2. Documentation to missing parameters in virt.init runner.

    zer0def committed Jul 24, 2018
    Copy the full SHA
    a1fa081 View commit details
    Browse the repository at this point in the history

  3. add windows integration tests for states.file

    Frode Gundersen committed Jul 24, 2018
    Copy the full SHA
    a7a9140 View commit details
    Browse the repository at this point in the history

  4. Merge branch '2017.7' into 45014

    Frode Gundersen committed Jul 24, 2018
    Copy the full SHA
    757fde7 View commit details
    Browse the repository at this point in the history

  5. Update Saltstack Logo banner on docs.saltstack.com

    @Ch3LL
    Ch3LL committed Jul 24, 2018
    Copy the full SHA
    73b1fc2 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2018

  1. Merge pull request saltstack#48749 from Ch3LL/logo_docs 

    Update Saltstack Logo banner on docs.saltstack.com
    Nicole Thomas committed Jul 25, 2018
    Copy the full SHA
    169afea View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

  1. fix tests

    Frode Gundersen committed Jul 26, 2018
    Copy the full SHA
    33c20c1 View commit details
    Browse the repository at this point in the history

  2. Merge branch '45014' of https://github.com/frogunder/salt into 45014

    Frode Gundersen committed Jul 26, 2018
    Copy the full SHA
    f08058b View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#48731 from zer0def/virt-runner-init-args 

    Fixed `enable_vnc` runner arg being passed into `seed_cmd` module arg in `virt.init`.
    Nicole Thomas committed Jul 26, 2018
    Copy the full SHA
    41464d4 View commit details
    Browse the repository at this point in the history

  4. Only run lint checks against changed files

    @KaiSforza
    KaiSforza authored and rallytime committed Jul 26, 2018
    Copy the full SHA
    4547231 View commit details
    Browse the repository at this point in the history

  5. test: except for OSError only

    @KaiSforza
    KaiSforza authored and rallytime committed Jul 26, 2018
    Copy the full SHA
    d4ca0e3 View commit details
    Browse the repository at this point in the history

  6. Threshold was wrong 

    I also removed the delta value check. It's going to be weird with the
number of runs we do, and it's also set to run on failures.
    @KaiSforza
    KaiSforza authored and rallytime committed Jul 26, 2018
    Copy the full SHA
    682a05b View commit details
    Browse the repository at this point in the history

  7. Merge pull request saltstack#48789 from rallytime/bp-48783 

    Back-port saltstack#48783 to 2017.7
    Nicole Thomas committed Jul 26, 2018
    Copy the full SHA
    bbea9ae View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2018

  1. Update linting docs to contain .testing.pylintrc use 

    The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.

The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.

Fixes saltstack#48417
    rallytime committed Jul 27, 2018
    Copy the full SHA
    5123b17 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#48795 from rallytime/fix-48417 

    Update linting docs to contain .testing.pylintrc use
    Nicole Thomas committed Jul 27, 2018
    Copy the full SHA
    d74f47b View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#48742 from frogunder/45014 

    add windows integration tests for states.file
    Nicole Thomas committed Jul 27, 2018
    Copy the full SHA
    8e61f3d View commit details
    Browse the repository at this point in the history

  4. Merge branch '2017.7' into '2018.3' 

    No conflicts.
    rallytime committed Jul 27, 2018
    Copy the full SHA
    4365107 View commit details
    Browse the repository at this point in the history

  5. Update old utils paths to use new utils paths

    rallytime committed Jul 27, 2018
    Copy the full SHA
    487458a View commit details
    Browse the repository at this point in the history