Erik Johnson
|
61ab47ee70
|
Merge branch '2017.7' into merge-2017.7-2018.3
Conflicts:
- salt/cloud/clouds/openstack.py
- salt/daemons/masterapi.py
- salt/master.py
- salt/modules/gentoo_service.py
- salt/pillar/__init__.py
- salt/pillar/git_pillar.py
- salt/runners/cache.py
- salt/runners/git_pillar.py
- salt/runners/winrepo.py
- salt/utils/docker/__init__.py
- salt/utils/gitfs.py
|
2018-03-02 16:20:20 -06:00 |
|
Justin Findlay
|
2eef3c65a6
|
tests.unit.modules.gentoo_service add retcode arg
|
2018-02-19 11:27:11 -08:00 |
|
Dmitry Kuzmenko
|
9b09d1b2c9
|
Salt Unicode Update 3rd tier 3rd bunch from DK
|
2018-01-22 14:38:49 +03:00 |
|
Pedro Algarvio
|
99bc71dc4e
|
Proper mocking.
|
2017-03-28 19:04:01 +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
|
ffec7dc299
|
Lint fixes
|
2017-03-06 14:35:16 +00: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 |
|