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
66,728 Commits 24 Branches 182 Tags 341 MiB
58c844a7d7
Commit Graph

66728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
ce765ad2df Merge pull request #31924 from jfindlay/2015.8 
update 2015.8.8 release notes
 2016-03-16 16:10:15 -06:00
C. R. Oldham
aa9a288b5a Add these files back in 2016-03-16 15:23:55 -06:00
C. R. Oldham
916ef26957 Remove .orig file mistakenly added, reformat example. 2016-03-16 15:20:55 -06:00
C. R. Oldham
3c8185571d Lint. 2016-03-16 15:19:43 -06:00
C. R. Oldham
9de9b9e86d Missin import 2016-03-16 15:11:19 -06:00
C. R. Oldham
d571f3b8fe Backport PR#31601 2016-03-16 15:09:54 -06:00
Pedro Algarvio
2fcc916c6a
Make sure all started processed, at least and as a last resort, are killed. 2016-03-16 19:40:49 +00:00
Pedro Algarvio
e1281e34cc
Don't assume the tests suite is running as root 2016-03-16 19:40:49 +00:00
Pedro Algarvio
916b6b402d
Skip tests if urllib3 is not installed 2016-03-16 19:40:48 +00:00
Nicole Thomas
390ef9fea7 Merge pull request #31922 from cachedout/issue_31890_1 
For 2015.8 head
 2016-03-16 13:07:11 -06:00
Justin Findlay
64dd8aebb2 update 2015.8.8 release notes 2016-03-16 11:49:01 -06:00
Mike Place
da075d9341 For 2015.8 head 2016-03-16 11:44:59 -06:00
Ch3LL
5bcc5b2f21 fix pylint and remove super() 2016-03-16 11:44:55 -06:00
Nicole Thomas
03e8b72655 Merge pull request #31904 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-16 11:23:54 -06:00
C. R. Oldham
53476f0be4 Fix bad merge. 2016-03-16 11:13:37 -06:00
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