rallytime 13e8124031 Merge branch '2017.7' into '2018.3' ... Due to the many merge conflicts created from #47106 against the 2017.7 branch and #46002 against the 2018.3 branch, the changes from #47106 have been largely removed from this merge forward and the HEAD of 2018.3 was taken. A separate fix for Tornado 5.0 support will need to be made directly against the 2018.3 branch. Conflicts: - doc/topics/development/conventions/formulas.rst - salt/master.py - salt/minion.py - salt/netapi/rest_tornado/saltnado.py - salt/states/zfs.py - salt/transport/ipc.py - salt/transport/tcp.py - salt/transport/zeromq.py - salt/utils/async.py - tests/support/helpers.py - tests/support/parser/cover.py - tests/unit/grains/test_core.py - tests/unit/modules/test_ssh.py - tests/unit/test_minion.py - tests/unit/utils/test_safe_walk.py		2018-04-27 13:38:35 -04:00
..
documentation.rst	Change all relevant Boron references to 2016.3.0	2016-02-10 15:45:28 -07:00
formulas.rst	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
index.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
packaging.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-15 16:20:48 -07:00
release.rst	Update the release process docs	2016-05-13 14:28:57 -06:00
style.rst	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00