rallytime d83727fdf9 Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/cli/api.py - salt/client/ssh/wrapper/state.py - salt/config/__init__.py - salt/crypt.py - salt/daemons/masterapi.py - salt/key.py - salt/loader.py - salt/master.py - salt/modules/archive.py - salt/modules/hipchat.py - salt/modules/pip.py - salt/modules/state.py - salt/modules/virt.py - salt/modules/x509.py - salt/state.py - salt/transport/tcp.py - salt/transport/zeromq.py - salt/utils/__init__.py - salt/utils/event.py - salt/utils/extmods.py - salt/utils/files.py - salt/utils/parsers.py - salt/utils/verify.py - tests/integration/shell/test_call.py - tests/unit/utils/test_args.py		2018-03-06 13:45:59 -05:00
..
__init__.py	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00
test_handlers.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
test_utils.py	Merge branch '2017.7' into '2018.3'	2018-03-06 13:45:59 -05:00