 rallytime
|
82e73fe49d
Merge branch '2018.3' into 'fluorine'
|
6 years ago |
|
Daniel A. Wozniak
|
df5e27156e
Add spm tests for windows
|
6 years ago |
|
rallytime
|
7e0db5cb15
Merge branch '2018.3' into 'fluorine'
|
6 years ago |
|
Daniel A. Wozniak
|
536fce611f
Increase function timeout
|
6 years ago |
|
Daniel A. Wozniak
|
1757eddae1
Increase ModuleTest.run_function timeout
|
6 years ago |
|
rallytime
|
ab6cc1c741
Update old utils paths to use new paths
|
6 years ago |
|
rallytime
|
ac406c49a7
Merge branch '2017.7' into '2018.3'
|
6 years ago |
|
Daniel A Wozniak
|
cd6706e9f0
Fix merge wart
|
6 years ago |
|
Daniel A Wozniak
|
3e55d10584
Platform module doesn't exist in 2017.7
|
6 years ago |
|
Daniel A. Wozniak
|
0394ece642
The set command does not work like inline env vars
|
6 years ago |
|
Daniel A. Wozniak
|
907b46d9f6
The set command does not work like inline env vars
|
6 years ago |
|
Daniel Wallace
|
5e07b8306b
fix last async issue
|
6 years ago |
|
Daniel Wallace
|
53c7ca16fb
fix last async issue
|
6 years ago |
|
Bo Maryniuk
|
47078a300f
Remove async keyword, moving it into the kwargs.
|
6 years ago |
|
Bo Maryniuk
|
31dccc4fdf
fix unicode literals
|
6 years ago |
|
Bo Maryniuk
|
6cf400bfc9
Remove async keyword, moving it into the kwargs.
|
6 years ago |
|
Bo Maryniuk
|
d4450707f7
fix unicode literals
|
6 years ago |
|
rallytime
|
6177d6e3c1
Merge branch '2018.3' into 'develop'
|
6 years ago |
|
rallytime
|
398cc78224
Merge branch '2017.7' into '2018.3'
|
6 years ago |
|
Ch3LL
|
48b5d2e9d3
Add timeout argument to run_salt for ShellCase
|
6 years ago |
|
rallytime
|
d991430715
Merge branch '2018.3' into 'develop'
|
6 years ago |
|
rallytime
|
7dc1e770c4
Merge branch '2018.3' into 'develop'
|
6 years ago |
|
Erik Johnson
|
41e5a75027
Add catch_timeout to run_script
|
6 years ago |
|
Erik Johnson
|
a1ce0631fd
Use @property instead of @staticmethod for config_dir
|
6 years ago |
|
Erik Johnson
|
551ada8e4d
Capture and log output of processes that timed out and were killed
|
6 years ago |
|
Nicole Thomas
|
a46e42ab11
Merge pull request #47927 from rallytime/merge-2018.3
|
6 years ago |
|
Erik Johnson
|
af02d5ba7b
Add result logging to run_script, make returns DRY
|
6 years ago |
|
rallytime
|
3273bbdab7
Merge branch '2017.7' into '2018.3'
|
6 years ago |
|
Erik Johnson
|
93ee5ee2b0
Fix all Sphinx warnings
|
6 years ago |
|
Erik Johnson
|
25afc932f7
WIP salt-jenkins issue 1000
|
6 years ago |
