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.

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

[2016.3] Merge forward from 2015.8 to 2016.3 #34679

Merged
merged 13 commits into from
Jul 14, 2016

Commits on Jul 7, 2016

  1. Change network state integration test to use test=True

    Justin Anderson committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    ed59113 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2016

  1. Some small changes

    Justin Anderson committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    b261683 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2016

  1. Clarifies the proper way to reference states

    It seems in some situations, or in some earlier version, using a `/`
    to reference sls files in subdirectories did work. However, because
    of the inconsistency it caused occasional confusion. This updates the
    tutorial to focus on the canonical `.` notation, which always works.
    lorengordon committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    bfe0dd0 View commit details
    Browse the repository at this point in the history
  2. Changed network state test to use test=True

    Justin Anderson committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    34bcf9c View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2016

  1. Merge pull request saltstack#34618 from jtand/network_integration_fix

    Network state integration test test=True
    Mike Place committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    3e612c3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dd1559a View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#34642 from jtand/mysql_integration_cleanup

    Check that mysqladmin exists before running mysql integration tests
    Mike Place committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    8a02091 View commit details
    Browse the repository at this point in the history
  4. Adjust the mine test a little bit to give it a better chance of succe…

    Mike Place authored and Nicole Thomas committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    5036026 View commit details
    Browse the repository at this point in the history
  5. Lint 34644 (saltstack#34651)

    * Better error handling for __virtual__ in dockerng module
    
    * Modify lodaer global test to use populated dunders
    
    This prevents a number of errors in the error log and makes for a
    more robust test IMHO
    
    * Lint saltstack#34644
    Nicole Thomas committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    bc63f25 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2016

  1. Merge pull request saltstack#34601 from lorengordon/clarify-doc

    Clarifies the proper way to reference states
    Mike Place committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    3b6f108 View commit details
    Browse the repository at this point in the history
  2. Revert "Modify lodaer global test to use populated dunders"

    This reverts commit f45dbe8.
    Mike Place committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    64a1548 View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#34676 from cachedout/partial_revert_34644

    Revert "Modify lodaer global test to use populated dunders"
    Mike Place committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    3192e16 View commit details
    Browse the repository at this point in the history
  4. Merge branch '2015.8' into '2016.3'

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