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
67,226 Commits 24 Branches 182 Tags 341 MiB
fa8d030ab7
Commit Graph

67226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
3e374e7ec6 Merge pull request #32243 from isbm/isbm-zypper-list-installed-ensure-latest 
Ensure latest pkg.info_installed ensure latest
 2016-03-31 11:09:59 -05:00
Bo Maryniuk
fba3d509ac Fix the documentation 2016-03-31 17:48:59 +02:00
Mike Place
a0221b54bc Merge pull request #32269 from s0undt3ch/2016.3 
Properly handle signals
 2016-03-31 09:29:29 -06:00
Nicole Thomas
9c1b2a43a9 Merge pull request #32252 from cro/proxy_grains_fixes 
Make grains for proxies work (though differently than the rest of Salt)
 2016-03-31 08:53:53 -06:00
Mike Place
88fa3c5f71 Merge pull request #32268 from ticosax/handle-dockerpy-old 
[dockerng] Improve detection for older versions of docker-py
 2016-03-31 08:51:46 -06:00
Mike Place
a491897a3b Merge pull request #32258 from jacobhammons/alive-interval-docs 
Replaces incorrect reference to `master_alive_check`
 2016-03-31 08:41:09 -06:00
Mike Place
8c68d8ac41 Merge pull request #32254 from twangboy/fix_31334 
Fix Display Name with spaces in win_servermanager
 2016-03-31 08:38:21 -06:00
Mike Place
8ca6bf2177 Merge pull request #32259 from jfindlay/tmpdir 
MacOS tmpdir
 2016-03-31 08:31:07 -06:00
Pedro Algarvio
2e54936847
Properly handle signals 2016-03-31 13:08:31 +01:00
Nicolas Delaby
05116aaa40 Improve detection for older versions of docker-py 
Docker module without a `docker.version_info` property
 2016-03-31 13:59:55 +02:00
Justin Findlay
8f558a5f41 tests...runtests_helpers: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:40 -06:00
Justin Findlay
0edd532add tests.integration: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:39 -06:00
Justin Findlay
c74c241831 tests.integration: use os.path.realpath 
This reverts bf894c37, 6b99798b, and 4028d80e.  `os.path.realpath`
behaves identically to `salt.utils.abs_readlink` on the doc tests in
that function.
 2016-03-30 21:09:39 -06:00
Jacob Hammons
ff8ca5ac2e Replaces incorrect reference to master_alive_check with master_alive_interval in docs 2016-03-30 20:32:43 -06:00
C. R. Oldham
e1b4093dfd Remove comment (it was in the wrong place). 2016-03-30 20:11:20 -06:00
Nicole Thomas
94c58f072a Merge pull request #32251 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-30 18:03:02 -06:00
Bo Maryniuk
73ad8a2bfc Fix lint 2016-03-31 01:55:38 +02:00
twangboy
e5f02c52be Fix a pylint error 2016-03-30 17:39:20 -06:00
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
twangboy
12d530f8f0 Fix win_servermanager state 2016-03-30 17:03:16 -06:00
rallytime
ea3d21d126 Fix failing test 2016-03-30 16:53:42 -06:00
twangboy
b26cb76abb Fix unit tests 2016-03-30 16:51:58 -06:00
rallytime
3a0987c7c1 Pylint fix 2016-03-30 16:05:03 -06:00
twangboy
1d5bcee390 Fix 31344 
funcitons now use OutputTo-Json
Fixes problem with returning values with spaces
list_installed only needs to call Get-WindowsFeature once
 2016-03-30 16:00:00 -06:00
C. R. Oldham
d4315aa902 Make grains for proxies work (though it is differently than the rest of Salt due to the way grains have to be loaded). Also remove unused 'enumerate_proxy' config variable. 2016-03-30 15:46:30 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 15:33:13 -06:00
Nicole Thomas
0f5e67de5d Merge pull request #32248 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-30 15:10:01 -06:00
Nicole Thomas
6216c37885 Merge pull request #32230 from terminalmage/issue32169 
systemd.py: Support both update-rc.d and chkconfig as managers of sysv services
 2016-03-30 15:09:43 -06:00
jacobhammons
bde2a1fc98 Merge pull request #32249 from jacobhammons/dot8 
Fixes windows download paths to account for patch
 2016-03-30 14:26:53 -06:00
Jacob Hammons
50d1df2482 Fixes windows download paths to account for patch 2016-03-30 14:26:03 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 13:38:38 -06:00
Erik Johnson
45af3e902a systemd.py: Support both update-rc.d and chkconfig as managers of sysv services 
Fixes #32169
 2016-03-30 14:28:53 -05:00
Mike Place
4a5d1b1dd3 Merge pull request #31768 from twangboy/mac_xattr_int 
Integration Tests for mac_xattr.py
 2016-03-30 13:03:25 -06:00
Mike Place
2816982178 Merge pull request #31959 from twangboy/mac_timezone_int 
Integration tests for mac_timezone.py
 2016-03-30 13:03:15 -06:00
Mike Place
50e34574d7 Merge pull request #31840 from twangboy/mac_shadow_int 
Integration tests for mac_shadow
 2016-03-30 13:02:44 -06:00
twangboy
ae61fa4851 Fix documentation 
Fixed errorneous return type for _get_account_policy
Added documentation for unsupported functions
 2016-03-30 12:56:39 -06:00
twangboy
8d5cd010cc Add more descriptive documentation for errors 2016-03-30 12:56:39 -06:00
twangboy
d900e17f4e Fix _set_account_policy function 2016-03-30 12:56:39 -06:00
twangboy
86d9dc21b7 Fix get_login_failed_count function 2016-03-30 12:56:39 -06:00
twangboy
a273fa041c Fix User not found detection 2016-03-30 12:56:39 -06:00
twangboy
6ebdf89e4d Syntax Error and Lint 2016-03-30 12:56:39 -06:00
twangboy
7302084a12 Added documentation about raise error 
Refactored
 2016-03-30 12:56:39 -06:00
twangboy
7dbd685e0b Remove redundant try/except blocks 2016-03-30 12:56:39 -06:00
twangboy
dfe148934b Fix typo 2016-03-30 12:56:39 -06:00
twangboy
a45d2270df Remove test for _convert_to_datetime 2016-03-30 12:56:39 -06:00
twangboy
845809139c Add test for _convert_to_datetime 2016-03-30 12:56:39 -06:00
twangboy
3a6ad91509 Fix some pylint errors 2016-03-30 12:56:39 -06:00
twangboy
7451ed547e Replaced cmd.run with mac_utils execute command 2016-03-30 12:56:39 -06:00
twangboy
f1a5134b92 Total rewrite of mac_shadow.py 
Updated mac_shadow integration tests
 2016-03-30 12:56:39 -06:00
twangboy
c62920fb08 Add destructiveTest decorators 2016-03-30 12:56:39 -06:00