rallytime 3e6445a9d6 Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - salt/beacons/log.py - salt/client/ssh/__init__.py - salt/modules/cmdmod.py - salt/utils/win_functions.py - tests/integration/modules/test_cmdmod.py - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/runners/test_state.py		2018-08-08 13:31:57 -04:00
..
salt-api.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-call.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-cloud.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-cp.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-key.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-master.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-minion.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-proxy.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-run.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-ssh.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-syndic.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt-unity.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
salt.7	Update man pages for 2017.7.8 release	2018-08-07 09:35:01 -04:00
spm.1	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00