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,598 Commits 24 Branches 182 Tags 341 MiB
5658753a5f
Commit Graph

66598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
d661081016 Lint. 2016-03-17 10:03:38 -06:00
Nicole Thomas
fb6d5fa44b Merge pull request #31946 from rallytime/merge-31886 
Fix pylint for #31886
 2016-03-17 09:45:10 -06:00
rallytime
86196cd59d Revert "not not" deletion and add comment as to why that is there 2016-03-17 09:39:14 -06:00
C. R. Oldham
59e0a6f923 Dont add this file 2016-03-17 09:10:38 -06:00
C. R. Oldham
c68b968403 Old-style proxymodules need to be setup earlier in minion init. Also include more correct comments in config.py 2016-03-17 09:10:38 -06:00
Mike Place
7fabdbc42a Merge pull request #31741 from cro/adext 
Add ability for external_auth minions to be pulled from LDAP/AD
 2016-03-17 09:04:49 -06:00
rallytime
98267ca100 Fix pylint for #31886 
Merges #31886
 2016-03-17 09:01:59 -06:00
Nicole Thomas
6d253d775b Merge pull request #31940 from sjorge/2016.3-schedule 
seconds is not always set, do not assume it is
 2016-03-17 08:55:12 -06:00
Mike Place
2d1f2a0c2e Merge pull request #31935 from twangboy/fix_build_script2 
Back port nullsoft build script from 2015.8
 2016-03-17 08:54:50 -06:00
Nicole Thomas
11642ed5b3 Merge pull request #31932 from sjorge/2016.3-badrebasesystembroken 
fix broken system module on SunOS cause by a0a66fa32600751d394d724b2f…
 2016-03-17 08:46:20 -06:00
Nicole Thomas
9ab4d6164b Merge pull request #31933 from rallytime/fix-test-links 
Fix linking syntax in testing docs
 2016-03-17 08:44:13 -06:00
Andreas Lutro
fefd3e2218 pass show_changes instead of show_diff to file.manage_file 
the show_diff argument has been deprecated, so don't pass it along to
another function since its value will not be correct.
 2016-03-17 14:30:18 +01:00
Andreas Lutro
55e3f3db52 prevent stacktrace from being written to the console 
stderr wasn't being set to a subprocess.PIPE, which means it would just
get printed to the console.
 2016-03-17 13:55:29 +01:00
Jorge Schrauwen
72c5d91306 seconds is not always set, do not assume it is 2016-03-17 11:47:31 +00:00
Ch3LL
b761059405 add absolute_import 2016-03-16 20:58:41 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
twangboy
4af8c9dbfc Back port nullsoft build script from 2015.8 2016-03-16 17:57:04 -06:00
C. R. Oldham
4c112292f6 Prevent stacktrace when eauth is not a dict 2016-03-16 16:48:39 -06:00
rallytime
06dd2c0411 Fix linking syntax in testing docs 2016-03-16 16:43:53 -06:00
Jorge Schrauwen
d2222268df fix broken system module on SunOS cause by a0a66fa326 2016-03-16 22:23:57 +00:00
Mike Place
723d0ca19f Merge pull request #31930 from cro/bp-31601 
Backport changes from 2016.3
 2016-03-16 16:12:28 -06:00
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