rallytime
|
3c298afa72
|
Merge branch '2017.7' into 'oxygen'
Conflicts:
- salt/modules/pip.py
- salt/modules/reg.py
- salt/modules/win_pkg.py
- salt/runners/manage.py
- salt/states/pkg.py
- salt/transport/zeromq.py
- salt/utils/event.py
- tests/integration/modules/test_pip.py
- tests/integration/states/test_user.py
- tests/unit/grains/test_core.py
- tests/unit/states/test_archive.py
- tests/unit/utils/test_boto.py
|
2018-01-23 13:26:43 -05:00 |
|
Daniel Wallace
|
f7fd35fc4a
|
test updating the minion blackout timeout to 10 seconds
|
2018-01-21 14:42:56 -07:00 |
|
rallytime
|
ccf790a83f
|
Update all references for moved functions to use "files" util
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
|
2017-07-18 10:31:01 -06:00 |
|
Pedro Algarvio
|
61003bca0a
|
Take care of resource leakage on tests
|
2017-04-04 18:58:20 +01:00 |
|
Pedro Algarvio
|
2ee6d5d589
|
Import from the original modules not tests.integration
|
2017-04-04 18:58:19 +01:00 |
|
Pedro Algarvio
|
40a64191a1
|
Absolute imports and A LOT of code cleanup.
|
2017-03-01 01:33:07 +00:00 |
|
Pedro Algarvio
|
3beb3fb801
|
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
|
2017-02-28 22:52:49 +00:00 |
|
Pedro Algarvio
|
15af4c9728
|
Test filenames conformity. Adjust for pytest.
|
2017-02-23 23:19:42 +00:00 |
|