rallytime e312efb5e7 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/modules/cmdmod.py - salt/modules/pillar.py - salt/modules/yumpkg.py - salt/state.py - salt/utils/pkg/rpm.py - salt/utils/schedule.py - tests/integration/states/test_npm.py - tests/integration/states/test_pkgrepo.py		2018-03-27 16:31:55 -04:00
..
salt-api.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-call.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-cloud.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-cp.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-key.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-master.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-minion.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-proxy.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-run.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-ssh.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-syndic.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt-unity.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
salt.7	Merge branch '2017.7' into '2018.3'	2018-03-27 16:31:55 -04:00
spm.1	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00