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

67039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
twangboy
9fe91a8fb5 Fix __random_string assignment 2016-03-30 12:56:39 -06:00
twangboy
1da27172b9 Add integration tests for mac_shadow 2016-03-30 12:56:39 -06:00
Mike Place
5d08db7c92 Merge pull request #32162 from terminalmage/issue31963 
Properly handle yum/zypper repositories in pkgrepo.managed
 2016-03-30 11:51:05 -06:00
Mike Place
231da529e0 Merge pull request #32224 from Ch3LL/add_grains_match_test 
Add grains match with wildcard tests
 2016-03-30 11:30:42 -06:00
Erik Johnson
5c1bdb812c Fix pkgrepo integration test 
Also re-enabled test on ubuntu 15.10.
 2016-03-30 11:34:55 -05:00
Ch3LL
665468b5e8 fix pylint 2016-03-30 10:28:48 -06:00
twangboy
66afd4855c Fix unit tests 2016-03-30 08:56:49 -06:00
twangboy
614b768d6a Add more specific error documentation 2016-03-30 08:56:49 -06:00
twangboy
faf15c7e99 Change from 'such file' to 'No such file' 2016-03-30 08:56:49 -06:00
twangboy
e7df94a6fa Verify success of write, delete, and clear 2016-03-30 08:56:49 -06:00
twangboy
6239aab76d Add documentation for exptected return values 2016-03-30 08:56:49 -06:00
twangboy
93f252d868 Fix some pylint errors 2016-03-30 08:56:49 -06:00
twangboy
2855ea3e2e Fix test_delete_missing unit test 2016-03-30 08:56:49 -06:00
twangboy
f5f7249c37 Fix unit tests 2016-03-30 08:56:49 -06:00
twangboy
8ea709cc3f Remove xattr.list from know_to_return_none 2016-03-30 08:56:49 -06:00
twangboy
7bd0e43790 Remove redundant raise statement 2016-03-30 08:56:49 -06:00
twangboy
cedc14e6f5 Fix tests for read and delete 2016-03-30 08:56:49 -06:00
twangboy
cbd868e12a Improve integration tests 2016-03-30 08:56:49 -06:00
twangboy
29c9c4a54a Fix error detection 2016-03-30 08:56:49 -06:00
twangboy
1934a17f8e Add additional error handling 2016-03-30 08:56:49 -06:00
twangboy
fb82a32b4d Fix xattr.list on no attributes 2016-03-30 08:56:49 -06:00
twangboy
833d63c27d Raise errors on command failures 2016-03-30 08:56:49 -06:00
twangboy
6f98a5204f Fix xattr.list returning None 
Fixes tests
Removes super calls from setUp and tearDown
 2016-03-30 08:56:49 -06:00
twangboy
bacaa9c4c0 Add missing import 2016-03-30 08:56:49 -06:00
twangboy
1094754085 Gate the tests for Mac OS X 2016-03-30 08:56:49 -06:00