Gareth J. Greenaway
|
0f15796484
|
Merge branch '2018.3' into merge-2018.3
Conflicts:
salt/utils/schedule.py
|
2018-11-26 11:43:51 -08:00 |
|
Gareth J. Greenaway
|
4bd0406e8d
|
Adding integration.scheduler.test_maxrunning to ignore list.
|
2018-11-23 17:07:16 -08:00 |
|
rallytime
|
3f2712fbc1
|
Merge branch '2018.3' into 'fluorine'
Conflicts:
- tests/unit/states/test_virt.py
- tests/unit/test_config.py
|
2018-10-29 12:36:28 -04:00 |
|
Erik Johnson
|
65fef9a7c0
|
Moar Lint
|
2018-10-23 14:48:31 -05:00 |
|
Erik Johnson
|
2ac939eace
|
Add test to check test module names and make sure they match the naming convention
|
2018-10-23 14:47:17 -05:00 |
|
Erik Johnson
|
80dcb44a0d
|
Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine
Conflicts:
- salt/utils/mac_utils.py
- tests/unit/config/test_config.py
- tests/unit/loader/test_globals.py
- tests/unit/ssh/test_ssh.py
- tests/unit/templates/test_jinja.py
- tests/unit/utils/vmware/test_host.py
- tests/unit/utils/vmware/test_license.py
|
2018-08-17 07:52:59 -05:00 |
|
Erik Johnson
|
ac50eb84e1
|
Remove redundant "test" from filename
|
2018-08-14 13:53:29 -05:00 |
|