valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,130 Commits 24 Branches 182 Tags 341 MiB
86ea047933
Commit Graph

65130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
86ea047933 Merge pull request #30734 from Unity-Technologies/feature/osx_assistive 
Added ability to change assistive access on OSX 10.9+
 2016-02-01 14:51:47 -07:00
Mike Place
e068c57eca Merge pull request #30778 from sjorge/module-zpool 
salt.modules.zpool had some issues with URL
 2016-02-01 14:20:43 -07:00
jacobhammons
028ddc9fe6 Merge pull request #30770 from jacobhammons/doc-toc-reorg 
Doc restructuring, organization, and cleanup
 2016-02-01 13:48:03 -07:00
Mike Place
abfdd3ee3c Merge pull request #30782 from jtand/cmdmod_script 
SyntaxError not appropriately caught.
 2016-02-01 13:12:29 -07:00
Mike Place
68f4fd2fb3 Merge pull request #30697 from Unity-Technologies/feature/proxy-settings 
Added ability to set proxy settings on OSX and Windows
 2016-02-01 13:04:59 -07:00
Colton Myers
25102fc78c Merge pull request #30790 from xmj/develop 
salt/modules/sysrc.py: Fix documentation for set_
 2016-02-01 12:25:44 -07:00
Johannes Meixner
b4117397aa salt/modules/sysrc.py: Fix documentation for set_ 
set_ documentation was yank&pasted from remove without changing it.

Instead, give a proper example how to use sysrc.set.
 2016-02-01 20:41:58 +02:00
Mike Place
d68d753dbb Merge pull request #30766 from alxf/local/issue-#29752 
Add feature mentionned in issue #29752.
 2016-02-01 11:57:51 -06:00
Mike Place
220920ed08 Merge pull request #30765 from sjorge/grains-mdata-fix 
mdata grains on smartos tweak
 2016-02-01 11:55:32 -06:00
justinta89
9b5ce69a54 SyntaxError not appropriately caught. Further testing shows that python2.4 will use print() without an error. 2016-02-01 10:34:24 -07:00
Jorge Schrauwen
5943ce6ef1 hande url as values better in salt.modules.zpool 2016-02-01 15:19:35 +00:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
alxf
0d2b96cb45 Add feature mentionned in issue #29752. 
- Add the opportunity to set a cron job from a state with a
      `special` keyword (eg. @reboot, @hourly...)
    - Does the counter part to give the opportunity to remove them from
      a state.
 2016-01-31 22:07:22 +01:00
Jorge Schrauwen
d3f5c7066b use roles instread of salt:roles mdata entry 2016-01-31 20:49:25 +00:00
Thomas S Hatch
e202ce1ce0 Merge pull request #30698 from Unity-Technologies/feature/win-firewall-icmp 
Added the ability to enable icmp rules on Windows Firewalls
 2016-01-31 12:09:29 -07:00
Thomas S Hatch
3dea383a9e Merge pull request #30746 from sjorge/module-network 
salt.utils.network.in_subnet should check both ipv4 and ipv6
 2016-01-31 12:01:02 -07:00
Thomas S Hatch
41858d2463 Merge pull request #30744 from jtand/cmdmod_script 
Adjusting script for cmd.script test
 2016-01-31 12:00:43 -07:00
Thomas S Hatch
64d3c2b255 Merge pull request #30742 from twangboy/revert_grain 
Revert os and os_family grains back to MacOS
 2016-01-31 12:00:20 -07:00
Thomas S Hatch
f8bcb1fee4 Merge pull request #30732 from s0undt3ch/features/pytest-salt 
We really MUST terminate all processes that the manager handles!
 2016-01-31 11:57:50 -07:00
Colton Myers
291fe929e4 Merge pull request #30754 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2016-01-29 17:11:31 -07:00
Mike Place
b8a6a97307 Merge pull request #30695 from Unity-Technologies/feature/beacon-glxinfo 
Added a beacon for GLXInfo
 2016-01-29 17:13:20 -06:00
Mike Place
837581e5cb Merge pull request #30715 from twangboy/mac_system 
Fixed syntax error in _validate_enabled
 2016-01-29 17:11:14 -06:00
Mike Place
fe19ca4480 Merge pull request #30729 from Unity-Technologies/feature/dism 
Added DISM module and states
 2016-01-29 17:10:32 -06:00
Mike Place
d08cff3d6f Merge pull request #30748 from twangboy/mac_autologin 
Ability to configure Auto Login on Mac OS X
 2016-01-29 16:59:50 -06:00
Colton Myers
967e862027 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/loader.py
    salt/modules/npm.py
    salt/pillar/__init__.py
 2016-01-29 15:51:52 -07:00
Colton Myers
716c2bb7c8 Merge pull request #30751 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-29 15:43:41 -07:00
Colton Myers
84eeab7720 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/returners/local_cache.py
 2016-01-29 14:57:31 -07:00
twangboy
8d39303be2 Refactors return in disable_auto_login 2016-01-29 12:31:15 -07:00
twangboy
39cf8d2b36 Add versionadded to docs 2016-01-29 12:27:35 -07:00
twangboy
a46ac5f316 Add documentation 2016-01-29 12:25:07 -07:00
twangboy
567a0a67ab Fix non-zero exit code error 
get_auto_login uses `defaults` to read the value for
`autoLoginUser`. If `autoLoginUser` does not exists, then
autoLogin is disabled. If `autoLoginUser` is not in the list,
`defaults` throws an error.
Added the `ignore_retcode=True` option to the `cmd.run_all` when
searching for `autoLoginUser`
 2016-01-29 12:12:10 -07:00
Jorge Schrauwen
e9e8050d73 salt.utils.network.in_subnet should check both ipv4 and ipv6 2016-01-29 19:01:01 +00:00
Daniel Hobley
4bb303e548 Lint fixes 2016-01-29 19:54:30 +01:00
justinta89
0acb145aa1 Adjusting script for cmd.script test 
After #29964 was merged the cmd.script and cmd.script_retcode tests on centos 5
started failing because the /usr/bin/env python version is the system default.
The script used print_fuction from __futures__ which was not introduced until
python2.6.

@The-Loeki, I noticed this after your changes to cmdmod function. If you have
thoughts or comments as to why this behavior changed after that, I'm all ears.
othersie, this should take care of the failures on centos 5 on jenkins.
 2016-01-29 11:52:17 -07:00
twangboy
ebdbfd21d6 Fix disable_auto_login 2016-01-29 11:50:19 -07:00
twangboy
dabbc96683 Add functions to modify autologin settings 
Added the following functions:
- get_auto_login
- enable_auto_login
- disable_auto_login
 2016-01-29 11:45:38 -07:00
Mike Place
447c871dfe Merge pull request #30738 from sjorge/module-mdata 
salt.modules.mdata should load on more operating systems
 2016-01-29 12:30:17 -06:00
Mike Place
2a8fa82eeb Merge pull request #30737 from sjorge/module-network 
workaround some SunOS oddities with ifconfig output
 2016-01-29 12:27:34 -06:00
Mike Place
98349d1d05 Merge pull request #30736 from Unity-Technologies/feature/osx_xattr 
Added xattr module and state for OS X
 2016-01-29 12:25:58 -06:00
twangboy
613694530f Revert os and os_family grains back to MacOS 2016-01-29 10:16:16 -07:00
Nicole Thomas
1f0d0f591e Merge pull request #30720 from clinta/fix-pem-managed-changes 
x509.pem_managed does not return changes dict
 2016-01-29 10:07:25 -07:00
Nicole Thomas
1f531c6561 Merge pull request #30701 from kraney/boto_cloudtrail 
Catch errors that were ignored in cloud trail state updates.
 2016-01-29 09:52:45 -07:00
Clint Armstrong
5c28efa9d3 return changes on test as well 2016-01-29 11:38:27 -05:00
Jorge Schrauwen
d003d3c5b3 add missing docs for mdata 2016-01-29 16:25:51 +00:00
Jorge Schrauwen
ebf288000c rename module as it is no longer SmartOS specific 2016-01-29 16:21:49 +00:00
Jorge Schrauwen
6e7e206827 salt.modules.smartos_mdata should load if mdata-list is available, except on the global zone 2016-01-29 16:21:01 +00:00
Thomas S Hatch
076268089a Merge pull request #30699 from abednarik/save_load_retry_time 
Add Retry to save_load.
 2016-01-29 09:08:30 -07:00
Jorge Schrauwen
1c917548fa workaround some SunOS oddities with ifconfig output 2016-01-29 15:58:49 +00:00
Nicole Thomas
486be7c78c Merge pull request #30721 from sjorge/module-vmadm 
vmadm.list should have keyed=True as default!
 2016-01-29 08:58:42 -07:00
Daniel Hobley
6ad5014968 Lint fixes 2016-01-29 15:29:06 +01:00