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

[2016.3] Merge forward from 2015.8 to 2016.3 #34887

Merged
merged 5 commits into from
Jul 22, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #34887

merged 5 commits into from
Jul 22, 2016

Commits on Jul 21, 2016

  1. Fix wheel test 

    Fix random ordering bug
    Mike Place committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    b4be66d View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#34859 from cachedout/fix_wheel_test 

    Fix wheel test
    Mike Place committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    4f4381e View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. Fail git.latest states with uncommitted changes when force_reset=False ( 

    saltstack#34869)

* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
    Erik Johnson authored and Nicole Thomas committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    1ca1367 View commit details
    Browse the repository at this point in the history

  2. Invalidate the target cache very quickly (saltstack#34862)

    @thatch45
    thatch45 authored and Nicole Thomas committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    fb223e1 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2015.8' into '2016.3' 

    No conflicts.
    rallytime committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    109b368 View commit details
    Browse the repository at this point in the history