valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,419 Commits 24 Branches 182 Tags 341 MiB
8594a8dd05
Commit Graph

86419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brett Benassi
8594a8dd05
Adding PY_COLORS=1 as PY_COLORS = 1 instead 2018-07-17 13:57:00 -06:00
Brett Benassi
314b0e3599
Adding PY_COLORS=1 for python programs to use ANSI Colors 2018-07-17 13:54:11 -06:00
Brett Benassi
b705e8f7a5
Adding correct spacing to options section 2018-07-17 12:26:37 -06:00
Brett Benassi
9d8a7e07db
Adding options to Jenkins pipline builds 2018-07-17 12:21:19 -06:00
Nicole Thomas
6e32bb7f74
Merge pull request #48614 from rallytime/bp-48562 
Back-port #48562 to 2017.7
 2018-07-17 11:04:03 -04:00
Nicole Thomas
1b6e6388f8
Merge pull request #48588 from garethgreenaway/48415_event_send_multi_master 
[2017.7] event send multi master
 2018-07-17 06:31:20 -04:00
Daniel Wallace
24ffda49ba
Merge pull request #48610 from gtmanfred/2017.7 
only run pylint on files that change
 2018-07-16 20:36:49 -05:00
Colton Myers
cb654bbf2c
Add timeouts to all s3 queries 2018-07-16 15:58:48 -04:00
Nicole Thomas
5391dd0a8d
Merge pull request #48584 from Ch3LL/mac_user_grp 
Fix grp import for mac in test_user integration test
 2018-07-16 15:28:12 -04:00
Daniel Wallace
779d1a3dcb
only run pylint on files that change 2018-07-16 14:06:49 -05:00
Nicole Thomas
61572b6780
Merge pull request #48555 from Ch3LL/ssh_id 
Fix state.sls_id not running on ssh minion
 2018-07-16 09:24:41 -04:00
Gareth J. Greenaway
fab25af1a9
Adding some quick documention about why we are setting ret=True following the channel.send. 2018-07-13 15:42:12 -07:00
Gareth J. Greenaway
bf78f4b188
If the channel send is sucessful and does not raise an exception, we set ret to True, in case a previous exception from a previous channel send to another master has sent it to False. 2018-07-13 15:38:09 -07:00
Ch3LL
585ee9db90
Fix grp import for mac in test_user integration test 2018-07-13 16:25:28 -04:00
Nicole Thomas
aa6dcf39e8
Merge pull request #48583 from Ch3LL/mac_flaky_tests 
Add flaky decorator to mac_system and mac_timezone tests
 2018-07-13 15:56:39 -04:00
Nicole Thomas
6973152057
Merge pull request #48534 from xetix/fix-zypper-latest_version 
Fix behaviour of function latest_version in zypper module when multip…
 2018-07-13 15:56:05 -04:00
Nicole Thomas
9985f0b4c1
Lint: remove extra blank line 2018-07-13 15:55:08 -04:00
Ch3LL
4ba2299a87
import flaky decorator on mac tests 2018-07-13 15:16:06 -04:00
Daniel Wozniak
10124034cb
Merge pull request #48582 from dwoz/test_prepend_fix 
Finally fix prepend for real
 2018-07-13 11:45:34 -07:00
Ch3LL
811220b41e
Add flaky decorator to mac_system and mac_timezone tests 2018-07-13 14:40:26 -04:00
Daniel Wozniak
f37571e0bd
Merge branch '2017.7' into test_prepend_fix 2018-07-13 11:29:51 -07:00
Daniel A Wozniak
136ddf5f54
Finally fix prepend for real 2018-07-13 11:25:27 -07:00
Gareth J. Greenaway
8d1551c5fb
When using Salt multi-master, if we encouter a salt master that has not accepted the minion key yet we should not exit right away, rather continue on and try the next salt master available in the list. 2018-07-13 10:29:59 -07:00
Daniel Wallace
13f67335f3
Merge pull request #48564 from dwoz/test_prepend_fix 
Fix failing prepend test
 2018-07-13 09:12:46 -05:00
Daniel A Wozniak
66b25e65bf
Fix failing prepend test 
The prepend test is failing when jenkins runs kithchen but is passing in
my test environment. Make sure each test starts without the 'etc' path
existing.
 2018-07-12 19:04:47 -07:00
Patrik
5fbead8a36
Merge branch '2017.7' into fix-zypper-latest_version 2018-07-12 21:05:54 +02:00
Daniel Wozniak
b8ce27729f
Merge pull request #48558 from dwoz/test_file_fix 
Remove which mock to get the test passing
 2018-07-12 12:04:11 -07:00
xetix
56ac449271 Merge branch 'fix-zypper-latest_version' of https://github.com/xetix/salt into fix-zypper-latest_version 2018-07-12 20:59:24 +02:00
xetix
db35d0c1e1 Adding testcase for this fix. 2018-07-12 20:58:16 +02:00
xetix
d2513757ed Fix behaviour of function latest_version in zypper module when multiple packages are passed to function. 
Function now properly return dict with empty string as version if latest packages is already installed, and multiple packages are passed to function
 2018-07-12 20:58:16 +02:00
Daniel A Wozniak
c858bf477f
Remove which mock to get the test passing 
This test passes in my local kitchen tests when the which mock is
removed. However, I added this mock to try and get the test passing in
jenkins. The original failure that caused me to add it was removed from
jenkins. This will either fix the test or reveal the other error that
needs to be fixed.
 2018-07-12 11:14:47 -07:00
xetix
44e87f5a0f Adding testcase for this fix. 2018-07-12 19:49:42 +02:00
Ch3LL
f69932f506
fix pylint 2018-07-12 12:37:24 -04:00
Daniel Wallace
a15c65202d
Merge pull request #48552 from KaiSforza/jenkins-junit-2017 
Set up junit in jenkins
 2018-07-12 11:23:32 -05:00
William Giokas
72b1830974
Set up junit in jenkins 
Moved the archive to the always statement. Doesn't change the junit
stuff, but now we at least save the XML when we fail.
 2018-07-12 10:17:03 -06:00
Ch3LL
70e36764ee
Add more tests for salt-ssh state.sls_id 2018-07-12 12:16:33 -04:00
Daniel Wallace
f73108026e
Merge pull request #48550 from gtmanfred/2017.7 
add posargs to tox pylint
 2018-07-12 09:34:24 -05:00
Daniel Wallace
d5c603d9b6
add posargs to tox pylint 2018-07-12 09:33:45 -05:00
Nicole Thomas
113b0426f8
Merge pull request #48535 from asnell/asnell-patch-2 
Update manage_file helptext
 2018-07-12 09:34:46 -04:00
asnell
d328f6e43d
Update manage_file helptext 
'source_hash' param should be 'source_sum'
 2018-07-11 17:15:03 -04:00
Ch3LL
dab80e805c
Fix state.sls_id to run on ssh minion and not master 2018-07-11 16:50:50 -04:00
xetix
b354c6863c Fix behaviour of function latest_version in zypper module when multiple packages are passed to function. 
Function now properly return dict with empty string as version if latest packages is already installed, and multiple packages are passed to function
 2018-07-11 21:47:20 +02:00
Daniel Wallace
0c0c05c2bc
Merge pull request #48527 from saltstack/revert-48525-2017.7 
Revert "add kazoo for testing zookeeper."
 2018-07-11 12:29:15 -05:00
Daniel Wallace
18d06c1a93
Revert "add kazoo for testing zookeeper." 2018-07-11 12:29:03 -05:00
Nicole Thomas
05bad3e71c
Merge pull request #48526 from twangboy/rollback_certifi-win32 
Rollback python-certifi-win32
 2018-07-11 13:26:55 -04:00
Mike Place
db066effe4
Merge pull request #48521 from Martin819/2017.7 
Back-port #48222 to 2017.7
 2018-07-11 10:42:50 -06:00
twangboy
361b3cdc2f
Rollback python-certifi-win32 
It's causing issues with the test suite on Windows
 2018-07-11 10:33:39 -06:00
Daniel Wallace
ed0bd2bbec
Merge pull request #48525 from gtmanfred/2017.7 
add kazoo for testing zookeeper.
 2018-07-11 11:09:40 -05:00
Daniel Wallace
d7a6bff2b2
add kazoo for testing zookeeper. 2018-07-11 11:07:47 -05:00
Martin Polreich
d5d01f6698
Fix for GlusterFS 4.0 and above 2018-07-11 16:08:30 +02:00