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 2018.3.2 to 2018.3 #48354

Merged
merged 20 commits into from
Jun 28, 2018
Merged

[2018.3] Merge forward from 2018.3.2 to 2018.3 #48354

merged 20 commits into from
Jun 28, 2018

Commits on Jun 13, 2018

  1. Ensure that the shared list of jids is passed when creating the Minio… 

    …n. Fixes an issue when minions are pointed at multiple syndics.
    @garethgreenaway
    garethgreenaway authored and rallytime committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    e4c719b View commit details
    Browse the repository at this point in the history

  2. Some fixes to the set_pause and rm_pause function in the state runner… 

    …, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality.
    @garethgreenaway
    garethgreenaway authored and rallytime committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    4b0ff49 View commit details
    Browse the repository at this point in the history

  3. fixing typo in alias_function call.

    @garethgreenaway
    garethgreenaway authored and rallytime committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    3556850 View commit details
    Browse the repository at this point in the history

  4. Catch two cases when a returner is not able to be contacted--these wo… 

    …uld throw a stacktrace.
    @cro
    cro authored and rallytime committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    91b45b4 View commit details
    Browse the repository at this point in the history

  5. One more case where returner doesn't respond

    @cro
    cro authored and rallytime committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    159b052 View commit details
    Browse the repository at this point in the history

  6. Lint: Add blank line

    Nicole Thomas committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    77feccc View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2018

  1. Merge pull request saltstack#48097 from rallytime/bp-48075 

    Back-port saltstack#48075 to 2018.3.2
    Nicole Thomas committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    074a97d View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#48099 from rallytime/bp-47915 

    Back-port saltstack#47915 to 2018.3.2
    Nicole Thomas committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    40c1bfd View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#48100 from rallytime/bp-48014 

    Back-port saltstack#48014 to 2018.3.2
    Nicole Thomas committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    36b99ae View commit details
    Browse the repository at this point in the history

  4. Add release notes for 2018.3.2

    rallytime committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    0b13be0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#48129 from rallytime/release-notes-2018.3.2 

    Add release notes for 2018.3.2
    Nicole Thomas committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    21aaf1c View commit details
    Browse the repository at this point in the history

  6. bootstrap kitchen branch tests with 2017.7.6

    @gtmanfred
    gtmanfred committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    6128519 View commit details
    Browse the repository at this point in the history

  7. Update man pages for 2018.3.2

    rallytime committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    8c34013 View commit details
    Browse the repository at this point in the history

  8. Merge pull request saltstack#48137 from gtmanfred/2018.3.2 

    [2018.3.2] bootstrap kitchen branch tests with 2017.7.6
    Nicole Thomas committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    b49271b View commit details
    Browse the repository at this point in the history

  9. Merge pull request saltstack#48138 from rallytime/man-pages-2018.3.2 

    Update man pages for 2018.3.2
    Nicole Thomas committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    f154545 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. always listen when gathering job info

    @gtmanfred
    gtmanfred committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    cecf564 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2018

  1. Merge pull request saltstack#48158 from gtmanfred/2018.3.2 

    always listen when gathering job info
    Nicole Thomas committed Jun 17, 2018
    Configuration menu
    Copy the full SHA
    521e926 View commit details
    Browse the repository at this point in the history

  2. Update release notes for 2018.3.2

    rallytime committed Jun 17, 2018
    Configuration menu
    Copy the full SHA
    dc2d40d View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2018

  1. Merge pull request saltstack#48171 from rallytime/2018.3.2-release-notes 

    Update release notes for 2018.3.2
    Nicole Thomas committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    e7893ae View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2018

  1. Merge branch '2018.3.2' into '2018.3' 

    Conflicts:
  - tests/integration/runners/test_state.py
    rallytime committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    fface7c View commit details
    Browse the repository at this point in the history