rallytime
|
c0f16dae74
|
Merge branch '2017.7' into 'develop'
Conflicts:
- doc/topics/tutorials/index.rst
- salt/crypt.py
- salt/modules/cmdmod.py
- salt/modules/grains.py
- salt/pillar/git_pillar.py
- salt/roster/clustershell.py
- tests/unit/states/test_augeas.py
- tests/unit/utils/test_utils.py
|
2017-10-16 15:26:19 -04:00 |
|
twangboy
|
fd1d6c31de
|
Fix unit.states.test_augeas for Windows
Mock `os.path.isfile` so the test will continue
|
2017-09-29 12:52:32 -06: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
|
f8d7530a58
|
Proper mocking.
|
2017-04-01 14:22:59 +01:00 |
|
Pedro Algarvio
|
9b1e55aa85
|
Import the full module namespace to avoid import shadowing.
https://github.com/saltstack/salt/pull/39996#issuecomment-287857698
|
2017-03-28 19:02:47 +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 |
|