valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,109 Commits 24 Branches 182 Tags 341 MiB
f0771134ac
Commit Graph

3624 Commits

Author SHA1 Message Date
Daniel Hobley
0a1da63d6a Added the ability to set OS X settings using defaults 2016-02-01 15:24:02 +01: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
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
fe19ca4480 Merge pull request #30729 from Unity-Technologies/feature/dism 
Added DISM module and states
 2016-01-29 17:10:32 -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
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
Daniel Hobley
6ad5014968 Lint fixes 2016-01-29 15:29:06 +01:00
Daniel Hobley
a4f4e52687 Added xattr module and state for OS X 
- Allows you to add and remove special attributes to/from files
 2016-01-29 15:01:40 +01:00
Daniel Hobley
e8c3a154f0 Added DISM module and states 
- Allows you to install features and capabilities on windows minions
 2016-01-29 10:35:58 +01:00
Daniel Hobley
76a788529a Merge branch 'develop' into feature/win-firewall-icmp 2016-01-29 09:35:41 +01:00
Daniel Hobley
76aa2fde84 Merge branch 'develop' into feature/beacon-glxinfo 2016-01-29 09:35:15 +01:00
Daniel Hobley
e40092a103 Added the ability to enable icmp rules on Windows Firewalls 
- Added more checks in the unit tests
- Updated unit tests to check for ICMP rules
 2016-01-28 14:38:50 +01:00
Steve Hajducko
3544dd995e Fix lsscsi issues for certain platforms 
The lsscsi command doesn't support the '-s' flag on any RHEL/CentOs system
until RHEL7.

The command now have an option to specify 'get_size' to enable
compatibility with the older platforms.

Also fixes some issues with lsscsi not being installed and exceptions
getting thrown because of that.
 2016-01-27 21:15:26 -08:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Nicole Thomas
d6e2c7aa82 Merge pull request #30614 from techhat/depimg 
WIP: Deprecate salt/modules/img.py
 2016-01-26 15:03:11 -07:00
Joseph Hall
29df2124a2 Remove tests for img.py since we're deprecating it 2016-01-26 11:00:38 -07:00
Colton Myers
5bc11d7539 Merge pull request #30631 from rallytime/fix-7811 
Refactor rabbitmq_cluster states to use test=true functionality correctly
 2016-01-26 09:23:49 -07:00
Colton Myers
621d8785de Merge pull request #30579 from sjorge/module-localemod 
Fix up salt.modules.locale(mod) for Solaris and some generic improvements
 2016-01-25 17:21:42 -07:00
Colton Myers
64f17568a4 Merge pull request #30627 from sjmh/etcd_set_tree 
Add etcd update function
 2016-01-25 17:07:46 -07:00
rallytime
bf9ffded6d Refactor rabbitmq_cluster states to use test=true functionality correctly 
Fixes #7811
 2016-01-25 16:47:54 -07:00
Colton Myers
94bf7790cf Merge pull request #30567 from rallytime/fix-25363 
Make sure rabbitmq_vhost states are using test=true properly.
 2016-01-25 16:19:45 -07:00
Colton Myers
818ff2af78 Merge pull request #30381 from quantonganh/launchctl-yosemite 
Launchctl yosemite
 2016-01-25 16:08:25 -07:00
rallytime
1e8e86007c Refactor rabbitmq_policy states to use test=true functionality correctly 
Fixes #25658
 2016-01-25 15:21:19 -07:00
Steve Hajducko
a015473d4e Add etcd update function 
Adds a update function that takes a dict and sets multiple etcd keys.
 2016-01-25 14:13:33 -08:00
Nicole Thomas
653292ec88 Merge pull request #30555 from twangboy/mac_brew 
renamed brew.py to mac_brew.py
 2016-01-25 12:30:31 -07:00
Jorge Schrauwen
4d2fa2e2aa switch unit test to except CommandExecutionError 2016-01-25 19:30:09 +00:00
rallytime
3f8b905642 Fix test failures 2016-01-25 12:08:30 -07:00
Nicole Thomas
25f127c948 Merge pull request #30580 from sjorge/module-timezone 
salt.modules.timezone improvements for Solaris-like OS's
 2016-01-25 11:43:25 -07:00
Nicole Thomas
b8009d7320 Merge pull request #30552 from twangboy/mac_pkgutil 
Renamed darwin_pkgutil.py to mac_pkgutil.py
 2016-01-25 10:47:57 -07:00
Nicole Thomas
fb0054afb5 Merge pull request #30556 from twangboy/mac_sysctl 
rename darwin_sysctl.py to mac_sysctl.py
 2016-01-25 10:46:04 -07:00
Jorge Schrauwen
98664445c7 Swapping one unknow for debian failed, because debian use a different 
function internally. Switched to RedHat for the test as it returns
LANG=XYZ
 2016-01-25 17:38:51 +00:00
Jorge Schrauwen
e4c511de4a update tests, we have a correct return now 2016-01-25 17:30:23 +00:00
Jorge Schrauwen
745f203ea3 unit test, better to test with unknown os_family, we expect "" result without patching cmd.run 2016-01-23 22:56:00 +00:00
Jorge Schrauwen
d153f43771 unit test was filling in fake os_familiy, new code skips the expensive cmd_run unknown os_family 2016-01-23 22:53:07 +00:00
twangboy
cec969db15 Fixed more tests 2016-01-22 19:24:38 -07:00
twangboy
aa47a2908f Fixed more lint 2016-01-22 19:20:24 -07:00
twangboy
3fcf9b4ba8 Fixed some lint 2016-01-22 19:15:29 -07:00
twangboy
e09f43b11b even more lint 2016-01-22 19:09:08 -07:00
twangboy
fef54563b0 More lint 2016-01-22 19:04:03 -07:00
twangboy
306d13a7fa Fixed tests 2016-01-22 17:36:48 -07:00
twangboy
1c58318013 Fixed tests 2016-01-22 17:32:42 -07:00
twangboy
88841e604f Fixed some tests 2016-01-22 17:27:18 -07:00
twangboy
6eb250a807 Fixed some tests 2016-01-22 17:20:25 -07:00
Mike Place
f27b602a0f Fix bad mock in win_service_test 2016-01-22 13:37:32 -07:00
Mike Place
44dea20bf3 Merge pull request #30550 from cachedout/fix_30113 
Fixup for Let test=True option work for http.query state #30113
 2016-01-22 11:35:31 -07:00
Mike Place
427f6f7cad Fix failing unit test 2016-01-22 10:54:25 -07:00
Andrew Colin Kissa
82a966b1f4 Add postgres_initdb state module tests 2016-01-22 12:16:51 +02:00
Andrew Colin Kissa
f5aa107583 Add tests for data directory init and existance check 2016-01-22 12:15:45 +02:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00