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
..
integration	Merge branch '2017.7' into '2018.3'	2018-03-06 13:45:59 -05:00
kitchen	comment wordpress module	2017-10-30 13:34:28 -06:00
perf	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
pkg/rpm
support	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
unit	Merge branch '2017.7' into '2018.3'	2018-03-06 13:45:59 -05:00
utils	Move test case to the unit tests	2018-01-26 10:34:31 +01:00
__init__.py
buildpackage.py
committer_parser.py	Use with blocks (or try/finally) to ensure filehandles are closed	2017-11-09 15:05:40 -06:00
conftest.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
consist.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
eventlisten.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
eventlisten.sh
jenkins.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
minionswarm.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
modparser.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
packdump.py
runtests.py	runtests.py: allow user to set optparse options in REPL	2018-01-29 08:53:40 -06:00
salt-tcpdump.py
saltsh.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
wheeltest.py
whitelist.txt
zypp_plugin.py	Pylint fixes	2017-06-21 10:09:11 +01:00