Permalink
Commits on Mar 13, 2014
  1. Fix pylint. Like a boss.

    basepi committed Mar 13, 2014
  2. Merge pull request #11163 from Jiaion/0.17

    thatch45 committed Mar 13, 2014
    fixed hash cache file handling Exceptions
Commits on Mar 12, 2014
Commits on Feb 26, 2014
  1. Merge pull request #10738 from nshalman/smartos-smf-0.17

    thatch45 committed Feb 26, 2014
    SMF Fixes (SmartOS / Solaris) 0.17 backport
Commits on Feb 25, 2014
  1. SmartOS/Solaris: fix SMF service management

    nshalman committed Feb 24, 2014
    fixes saltstack/salt#10702
    
    The functions previously named get_enabled and get_disabled
    actually only queried what services were running or not
    
    This caused breakages where a state that both requested
    "enabled" and "running" could cause salt to start the
    service which would make it appear in the list of
    enabled services, but not actually get enabled
    and thus not actually come back up on reboot
    
    Those functions have been renamed to get_running
    and get_stopped
    
    An accurate enabled function has been written
    which queries the true property that determines
    if a service will come up at boot
    and disabled returns its negation.
    
    New get_enabled and get_disabled functions have
    also been written which accurately return the
    list of enabled or disabled services
    Those functions return full FMRIs (rather than the
    much shorter 'SVC' column) because that's how
    SMF actually works internally.
Commits on Feb 24, 2014
  1. Solaris/SmartOS: Handle services in maintenance

    nshalman committed Jan 31, 2014
    SMF has a concept of the maintenance state where the
    system knows the service is broken which requires an
    explicit "svcadm clear <service>"
    
    "svcadm enable -s <service>" returns code 3 when the service
    is in maintenance (-s means wait to see how enabling went)
    
    Salt should notice a return code of 3, attempt to clear
    the service and try to enable one more time.
    
    Common use case is a broken configuration file.
    The user pushes a fix to the config file with salt which should
    clear the maintenance state and attempt to enable the service
    again.
  2. Merge pull request #10693 from Jiaion/0.17

    thatch45 committed Feb 24, 2014
    fix master fileserver cache exception return hash not hsum, KeyError
Commits on Feb 19, 2014
  1. Merge pull request #10588 from mtorromeo/backport-9470

    thatch45 committed Feb 19, 2014
    Backport fix for #9470 to 0.17 (Allow git.current_branch to work with git<1.7.8)
  2. Allow git.current_branch to work with git<1.7.8

    terminalmage committed with mtorromeo Dec 28, 2013
    "git branch" and "git branch --list" are functionally identical, but the
    "--list" parameter was not added to git until version 1.7.8, so older
    versions of git (such as the one in the RHEL/CentOS 6 repositories) are
    unable to successfully run this function.
    
    This commit removes the "--list" from the git command used in this
    function.
Commits on Feb 14, 2014
  1. Merge pull request #10419 from s0undt3ch/0.17

    whiteinge committed Feb 14, 2014
    0.17 cherry-picks
Commits on Feb 13, 2014
  1. fix cache file perms

    UtahDave committed with basepi Feb 7, 2014
  2. fix highstate cache file perms

    UtahDave committed with basepi Feb 7, 2014
  3. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
    Conflicts:
    	salt/utils/master.py
  4. read/write binary w/msgpack files

    UtahDave committed with basepi Feb 7, 2014
    Conflicts:
    	salt/utils/minions.py
  5. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
  6. correctly set umask fixes #9882

    UtahDave committed with basepi Feb 7, 2014
  7. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
  8. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
    Conflicts:
    	salt/fileserver/__init__.py
  9. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
  10. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
    Conflicts:
    	salt/client/ssh/__init__.py
    	salt/daemons/masterapi.py
  11. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
  12. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
  13. read/write binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
  14. read/write in binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
  15. more read/write in binary w/msgpack

    UtahDave committed with basepi Feb 7, 2014
    Conflicts:
    	salt/master.py
  16. use single quotes

    UtahDave committed with basepi Feb 7, 2014
  17. write msgpack as binary

    UtahDave committed with basepi Feb 7, 2014
  18. read and write binary with msgpack

    UtahDave committed with basepi Feb 7, 2014
    Conflicts:
    	salt/modules/state.py