valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,612 Commits 24 Branches 182 Tags 341 MiB
7340a29541
Commit Graph

66612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
8a7b8853fa Fix structure of examples for external auth (was missing ':'), wrap some ldap calls in try/except, return a modified auth_list that replaces 'ldap()' entries with ldap matches instead of appending. 2016-03-16 10:44:54 -06:00
C. R. Oldham
22d14e1097 Lint. 2016-03-16 10:44:54 -06:00
C. R. Oldham
4ebe31a107 k 2016-03-16 10:44:54 -06:00
C. R. Oldham
0aebfae725 Remove adext.py, not enough changes from ldap.py to warrant separate module. Add call in auth/__init__.py to do necessary lookups 2016-03-16 10:44:00 -06:00
C. R. Oldham
b17753d3a1 Initial commit 2016-03-16 10:42:16 -06:00
C. R. Oldham
7c3f188b36 Lint. 2016-03-16 10:42:16 -06:00
C. R. Oldham
7aaa893549 k 2016-03-16 10:42:16 -06:00
C. R. Oldham
b4f902db1a Remove adext.py, not enough changes from ldap.py to warrant separate module. Add call in auth/__init__.py to do necessary lookups 2016-03-16 10:42:16 -06:00
C. R. Oldham
701da1707a Initial commit 2016-03-16 10:42:16 -06:00
Mike Place
a4b3462346 Merge pull request #31906 from sbreidba/win_dacl_fixes 
Win_dacl module: fix FULLCONTROL / FILE_ALL_ACCESS definition
 2016-03-16 09:20:19 -06:00
Mike Place
43240dc566 Merge pull request #31912 from jfindlay/log_mixin 
log.mixins: remove extermporaneous .record
 2016-03-15 19:56:46 -06:00
Mike Place
b068eaa963 Merge pull request #31745 from isbm/isbm-always-minion-errcode-2-fix 
Fix the always-false behavior on checking state
 2016-03-15 17:02:19 -06:00
Justin Findlay
9f9c694654 log.mixins: remove extermporaneous .record 2016-03-15 16:54:09 -06:00
Mike Place
1b65b48ac3 Merge pull request #31877 from alprs/fix-salt_ssh_log 
Set option.explicit when passing from Saltfile
 2016-03-15 16:16:26 -06:00
rallytime
f8b4b1b211 last pylint! 2016-03-15 16:06:54 -06:00
rallytime
892591a39c More pylint fixes 2016-03-15 15:50:05 -06:00
rallytime
35b2076584 Pylint fixes 2016-03-15 14:55:35 -06:00
Nicole Thomas
d05c3eeba9 Merge pull request #31911 from rallytime/merge-31903-with-pylint 
Merge #31903 with pylint fix
 2016-03-15 14:35:35 -06:00
Mike Place
819a4a8b54 Merge pull request #31883 from mvpstars/scaleway-x86 
Fix scaleway cloud provider and manage x86 servers
 2016-03-15 14:31:18 -06:00
rallytime
85e5acd11a Merge #31903 with pylint fix 
Merges #31903
 2016-03-15 14:05:09 -06:00
Mike Place
142c47c50d Merge pull request #31903 from terminalmage/fix-git-pillar 
Use remote_ref instead of local_ref to see if checkout is necessary
 2016-03-15 14:04:56 -06:00
Mike Place
ffd65c36e5 Merge pull request #31845 from sakateka/check_file_meta_clean_tmp 
Now a check_file_meta deletes temporary files when test=True
 2016-03-15 13:55:21 -06:00
C. R. Oldham
7428c73724 Merge pull request #31901 from rallytime/bp-31846 
Back-port #31846 to 2015.8
 2016-03-15 13:12:43 -06:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable 
Hotfix/windows proxy enable
 2016-03-15 12:58:33 -06:00
Skip Breidbach
54d81b9b42 Fix FULLCONTROL / FILE_ALL_ACCESS definition (bugfix and code simplification). 
Use consistent mechanism fro obtaining user SID.
Allow wildcarding (via optional parameters) for a variety of methods (get, rm_ace, check_ace).
 2016-03-15 11:49:04 -07:00
Nicole Thomas
37f1ce9be2 Merge pull request #31905 from terminalmage/update-versionadded 
Update versionadded directive
 2016-03-15 12:43:06 -06:00
Erik Johnson
dcc196c9e1 Update versionadded directive 
This fix is going into 2015.8.8 after all.
 2016-03-15 13:41:39 -05:00
Erik Johnson
35f6407d11 Merge pull request #31902 from rallytime/update-version-31857 
Update versionadded tag for new funcs
 2016-03-15 13:41:08 -05:00
rallytime
1a1ce05186 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - .testing.pylintrc
  - salt/cloud/clouds/joyent.py
 2016-03-15 12:34:57 -06:00
Erik Johnson
af29940e1c Use remote_ref instead of local_ref to see if checkout is necessary 2016-03-15 13:27:19 -05:00
rallytime
5cd09150cd Update versionadded tag for new funcs 2016-03-15 12:23:11 -06:00
C. R. Oldham
1edd6ce302 Extra comment. 2016-03-15 12:17:26 -06:00
C. R. Oldham
6c2ef03b11 Fix event bus flood caused by unexpected recursive call. 2016-03-15 12:17:25 -06:00
Mike Place
440e0dcbe0 Merge pull request #31825 from jtand/udpate_pylintrc 
Updated .testing.pylintrc to match newer versions of pylint
 2016-03-15 12:12:44 -06:00
Nicole Thomas
471c9444a3 Merge pull request #31900 from rallytime/fix-psutil-warning 
Add "python module" clarification to ps __virtual__ warning.
 2016-03-15 11:59:35 -06:00
Nicole Thomas
1be9c91761 Merge pull request #31888 from terminalmage/fix-depends-decorator 
Fix salt.utils.decorators.Depends
 2016-03-15 11:09:54 -06:00
Nicole Thomas
4f7aad7be5 Merge pull request #31882 from jacobhammons/rel-notes 
Updated release notes & module reference
 2016-03-15 10:56:36 -06:00
rallytime
22403d69ae Add "python module" clarification to ps __virtual__ warning. 
Added based on comment from Issue #31867
 2016-03-15 10:53:12 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Daniel Hobley
4884844ad6 Only include state changes if something actually happened 2016-03-15 12:00:41 +01:00
Erik Johnson
394410e2b0 Add integration test for depends decorator 2016-03-14 22:16:10 -05:00
Erik Johnson
caa3cc1007 Fix salt.utils.decorators.Depends 
bebdc266 broke this decorator, because switching from getting the module
to getting a frame means dir(frame) does not contain the imported names.
Those now reside in frame.f_globals and frame.f_locals.

This commit fixes the membership check to look in the proper location.
 2016-03-14 22:16:00 -05:00
Nicolas Morin
1662a080e1 Update scaleway cloud provider to manage x86 servers 2016-03-14 23:37:01 +01:00
Jacob Hammons
fd7f7bcddf Updated release notes 
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
 2016-03-14 16:34:22 -06:00
justinta89
9a14e02766 Updated beacons/sh.py to work with enumerate() 2016-03-14 16:13:40 -06:00
Mike Place
c44c1b5e59 Merge pull request #31878 from rallytime/fix-psutil-warning 
Make sure __virtual__ error message is helpful when psutil is missing
 2016-03-14 15:31:42 -06:00
justinta89
0ecec691a0 Adjusted beacons to work with enumerate better 2016-03-14 14:33:32 -06:00
Nicole Thomas
d357e4ea44 Merge pull request #31857 from sjorge/solarish_shadow 
gen_password and del_password missing from solaris_shadow
 2016-03-14 14:29:50 -06:00
Nicole Thomas
1b0b2d3f1a Merge pull request #31879 from cro/idrac_fixes_0314 
Clarify some comments
 2016-03-14 13:59:35 -06:00
Jorge Schrauwen
38231303f3 .9 release as mentioned by rallytime 2016-03-14 19:41:20 +00:00