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 #34229

Merged
merged 7 commits into from
Jun 22, 2016

Commits on Jun 21, 2016

  1. Configuration menu
    Copy the full SHA
    b7d49c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2016

  1. Change target for dockerng assuming default status to Nitrogen release (

    saltstack#34206)
    
    The work I need to do in the loader to achieve this is not likely to be
    done in time for the Carbon release.
    Erik Johnson authored and Nicole Thomas committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    5bca5c4 View commit details
    Browse the repository at this point in the history
  2. Clarify pkg.list_repo_pkgs docstring for held packages (saltstack#34188)

    Erik Johnson authored and Nicole Thomas committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    5d3ec31 View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#34182 from rallytime/fix-34043

    Handle child PIDs differently depending on the availability of psutils
    Mike Place authored Jun 22, 2016
    Configuration menu
    Copy the full SHA
    6d643cd View commit details
    Browse the repository at this point in the history
  4. Fix a pair of gitfs bugs (saltstack#34218)

    * Add salt.utils.is_hex()
    
    * dulwich: use salt.utils.is_hex() to confirm ref is hexidecimal
    
    * Restore ability for SHA1 saltenvs to be used in gitfs
    
    This uses salt.utils.is_hex() to check if the desired environment is
    hex, and allowing it to be used for gitfs operations when it is.
    
    * pygit2: Catch ValueError when trying to resolve SHA1
    
    Hex SHAs which are less than 4 characters will raise a ValueError, this
    commit catches these exceptions.
    
    See saltstack#34213 for more information.
    Erik Johnson authored and Nicole Thomas committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    02eb331 View commit details
    Browse the repository at this point in the history
  5. fix regression from saltstack#33681 which causes pulling a list of s3…

    … objects via s3.query to fail (saltstack#34208)
    lomeroe authored and Nicole Thomas committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    56c7267 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2015.8' into '2016.3'

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