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

[develop] Merge forward from 2017.7 to 2018.8 #50737

Merged
merged 14 commits into from Dec 4, 2018
Merged

[develop] Merge forward from 2017.7 to 2018.8 #50737

merged 14 commits into from Dec 4, 2018

Commits on Nov 26, 2018

  1. Eat an exception from an entry point instead of letting it kill the s… 

    …ystem.
    @AstraLuma
    AstraLuma committed Nov 26, 2018
    Copy the full SHA
    fb05bd5 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2018

  1. Improve logging output

    @AstraLuma
    AstraLuma committed Nov 28, 2018
    Copy the full SHA
    07868f1 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2017.7' into loader-exception-handler

    @AstraLuma
    AstraLuma committed Nov 28, 2018
    Copy the full SHA
    dadeb0d View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2018

  1. ci/lint corrected filenames and test condition on full lint 

    Also fix CODEOWNER team name
    @damon-atkins
    damon-atkins committed Nov 29, 2018
    2
    Copy the full SHA
    b6d1605 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#50670 from damon-atkins/jenkins_pylint 

    Corrections to ci/lint from saltstack#50583
    Mike Place committed Nov 29, 2018
    Copy the full SHA
    d9e7be1 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2018

  1. Use single quotes per style guide

    @AstraLuma
    AstraLuma committed Nov 30, 2018
    Copy the full SHA
    8697744 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'loader-exception-handler' of github.com:astronouth7303/… 

    …salt into loader-exception-handler
    @AstraLuma
    AstraLuma committed Nov 30, 2018
    Copy the full SHA
    194801a View commit details
    Browse the repository at this point in the history

  3. Merge branch '2017.7' into loader-exception-handler

    @AstraLuma
    AstraLuma committed Nov 30, 2018
    Copy the full SHA
    0f72815 View commit details
    Browse the repository at this point in the history

  4. ensure archiveArtifacts are always collected. Use CHANGE_BRANCH to de… 

    …tect merge-forward
    @damon-atkins
    damon-atkins committed Nov 30, 2018
    Copy the full SHA
    5936066 View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#50632 from astronouth7303/loader-excepti… 

    …on-handler

Better handle errors in entry points
    Mike Place committed Nov 30, 2018
    Copy the full SHA
    22acaaa View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2018

  1. Merge pull request saltstack#50702 from damon-atkins/jenkins_pylint 

    Fixes/Improvements to ci/lint.
    @garethgreenaway
    garethgreenaway committed Dec 1, 2018
    Copy the full SHA
    979b3aa View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2018

  1. Honor run_run timeout for shell tests

    @dwoz
    dwoz committed Dec 2, 2018
    Copy the full SHA
    ecd8486 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2018

  1. Merge pull request saltstack#50718 from dwoz/run_run_timeout 

    Honor run_run timeout for shell tests
    @dwoz
    dwoz committed Dec 3, 2018
    Copy the full SHA
    246c055 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2018

  1. Merge branch '2017.7' into merge-2017.7 

     Conflicts:
	tests/support/case.py
    @garethgreenaway
    garethgreenaway committed Dec 4, 2018
    Copy the full SHA
    fde8db5 View commit details
    Browse the repository at this point in the history