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
73,797 Commits 24 Branches 182 Tags 341 MiB
04753bf67c
Commit Graph

73797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ed lane
eefc895645 partially revert an overly zealous cut & paste 2016-09-07 13:37:30 -06:00
ed lane
40c89474aa add keepalive for sockets initiated by master. 2016-09-07 13:25:34 -06:00
twangboy
da2dded3c3 Use /etc instead of /root 2016-09-07 12:34:33 -06:00
twangboy
b4112247a4 Fix test not starting, skip broken functions 2016-09-07 12:01:38 -06:00
mguegan
08b636cc75 Fix retrieval of shadow password for OpenBSD (#36112) 
Tested with :
 - OpenBSD/amd64 5.9
 - OpenBSD/amd64 6.0

As the patch is inside the OpenBSD _and_ NetBSD condition, it would be
necessary to test with NetBSD too (which I didn't).
 2016-09-07 18:31:17 +02:00
Felix Deschamps
e5e330c159 Update sdb.py 2016-09-07 09:28:38 -07:00
Erik Johnson
796156c5f5 Add attribution 2016-09-07 11:17:56 -05:00
rallytime
40d0def479 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/states/archive.py
 2016-09-07 10:11:36 -06:00
Ch3LL
ee398a94b6 fix pylint 2016-09-07 10:05:44 -06:00
twangboy
dc1988add5 fix download when requests not present 2016-09-07 09:59:51 -06:00
Erik Johnson
2e56527ead Move command logging to before win_runas 
With the addition of runas for Windows in 2016.3.0, commands run using
Windows runas would not be logged at all, as we would return from the
_run() function before we got to the line where this information was
logged. This commit moves the command logging up to before we enter the
if block where the win_runas code would be executed, restoring the
prior logging behavior.
 2016-09-07 10:36:13 -05:00
Mike Place
fd7f24d993 Merge pull request #36100 from cachedout/safe_gem_check 
Skip Ruby tests on exception in pre-req check
 2016-09-07 23:57:10 +09:00
Mike Place
2fddfe2887 Merge pull request #36101 from sitepoint/adjtime_fix_fix 
Check for RTC support via /dev/rtc (#4983)
 2016-09-07 23:56:44 +09:00
rallytime
de4f77cb68 Fixup failing test: need to mock __utils__ instead of salt.utils.cloud call 2016-09-07 08:46:47 -06:00
Mike Place
ac30edb57b Minion working 2016-09-07 23:34:46 +09:00
Benedikt Werner
e4ac1d1a42 Added apache module support for SUSE systems 2016-09-07 15:58:42 +02:00
Mike Place
45ba2e806b Merge pull request #35923 from kstreee/fix-cli-stalling 
Fixes a bug that Ctrl-c not working on Salt CLI.
 2016-09-07 20:47:50 +09:00
Antonio Lobato
208a94679d WIP for GCE salt cloud volume support. 2016-09-07 00:08:51 -07:00
Adam Bolte
c6ac9bc795
Check for RTC support via /dev/rtc (#4983) 2016-09-07 16:09:14 +10:00
Mike Place
6460412b1c Merge pull request #36042 from jfindlay/parallels 
add functions to parallels execution module
 2016-09-07 15:09:10 +09:00
Mike Place
ff04c162bd Skip Ruby tests on exception in pre-req check 2016-09-07 14:32:47 +09:00
Mike Place
abfe8560f8 Merge pull request #36098 from cachedout/manage_test_fix 
A more liberal search minion strings in manage test
 2016-09-07 14:26:28 +09:00
Mike Place
6216e1df8c Merge pull request #36050 from m03/add-initial-win_snmp-unit-tests 
Add initial unit tests for win_snmp
 2016-09-07 14:26:01 +09:00
Mike Place
48dc5ad4ee Merge pull request #36078 from thatch45/failhard_test 
Failhard test=True fix
 2016-09-07 14:10:35 +09:00
Mike Place
37cfbe66b0 Merge pull request #36099 from cachedout/pr-36097 
Skip /etc/adjtime check if RTC is N/A (#4983)
 2016-09-07 13:25:02 +09:00
Mike Place
92ce37f6e2 Lint 2016-09-07 13:24:45 +09:00
Mike Place
dfcc14ad45 A more liberal search minion strings in manage test 
Correct falures where the formatting is slightly different.
 2016-09-07 12:37:29 +09:00
Adam Bolte
3437a06084
Skip /etc/adjtime check if RTC is N/A (#4983) 2016-09-07 12:29:30 +10:00
Mike Place
4e609a2962 Merge pull request #36062 from rallytime/fix-36045 
Add test to catch sample config files that are not commented out
 2016-09-07 10:30:30 +09:00
Mike Place
8d82f7aae5 Merge pull request #36035 from skizunov/develop2 
Fix Windows salt-master
 2016-09-07 10:28:35 +09:00
Erik Johnson
91eafddda6 Pass the "password" param to git module functions 2016-09-06 18:59:19 -05:00
Erik Johnson
7871065d32 Use "user" instead of "runas" in _git_run() helper 
This makes the calls to this function more uniform in the execution
module.
 2016-09-06 18:59:19 -05:00
Erik Johnson
5943b4662c Add "password" param to funcs which support the user parameter 
This allows Windows users to run commands as a different user
 2016-09-06 18:59:19 -05:00
Erik Johnson
5c7b9f0341 Make "password" an explicit argument, not a kwarg 2016-09-06 18:59:19 -05:00
twangboy
b4479bff5f Add additional required dll's 2016-09-06 17:36:38 -06:00
David Boucha
75933869cb disable some pylint checks 2016-09-06 17:32:22 -06:00
David Boucha
31ed4039b6 add missing imports and namespace them 
Fixes #36087
 2016-09-06 17:29:09 -06:00
plastikos
dde85e1144 Various fixes for MacOS X (#36085) 
* Change "unknown" user to "some_unknown_user_xyz" since "unknown"
  *is* a valid user

* Add timeout to proxy test_exit_status_no_proxyid() since a known
  failure case is to infinitely loop with an error.

* Always force the source code tree under test to be the first entry
  in PYTHONPATH (excluding verbatim_env)
 2016-09-06 16:30:08 -06:00
Nicole Thomas
017a3df12b Merge pull request #36084 from rallytime/bp-36077 
Back-port #36077 to carbon
 2016-09-06 16:29:45 -06:00
plastikos
1101e30389 Various fixes for MacOS X (#36080) 
* Change "unknown" user to "some_unknown_user_xyz" since "unknown"
  *is* a valid user

* Add timeout to proxy test_exit_status_no_proxyid() since a known
  failure case is to infinitely loop with an error.

* Always force the source code tree under test to be the first entry
  in PYTHONPATH (excluding verbatim_env)
 2016-09-06 16:29:26 -06:00
Ch3LL
4afc82ac63 add salt-run state.event test 2016-09-06 15:16:16 -06:00
Thomas S Hatch
40081176af Merge pull request #34529 from Ch3LL/add_skip_verify_archive 
Add skip_verify for archive.extracted
 2016-09-06 15:05:31 -06:00
twangboy
9e0f45785a Fix some lint 2016-09-06 15:02:02 -06:00
twangboy
ca414e01de Fix capitalization error in setUp and tearDown 2016-09-06 15:02:02 -06:00
twangboy
af3f70d877 Seperate sleep on power button test 2016-09-06 15:02:02 -06:00
twangboy
c2b42f69c1 Move test available into their own classes 2016-09-06 15:02:02 -06:00
twangboy
efb425781f Fix lint errors 2016-09-06 15:02:02 -06:00
twangboy
35dd0619cb Check string type 2016-09-06 15:02:02 -06:00
twangboy
701031ff40 Fix sleep_on_power test 2016-09-06 15:02:02 -06:00
twangboy
5e19d4664a Check the availablity of individual tests 2016-09-06 15:02:02 -06:00