rallytime 4abfd26e86 Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/dev_python27.txt - requirements/dev_python34.txt - salt/fileclient.py - salt/output/__init__.py - salt/serializers/configparser.py - salt/states/pkg.py - salt/states/zpool.py - salt/transport/tcp.py - tests/integration/cloud/providers/test_ec2.py - tests/integration/modules/test_mac_user.py - tests/integration/modules/test_pip.py - tests/integration/modules/test_pkg.py - tests/integration/modules/test_service.py - tests/integration/states/test_pip_state.py - tests/integration/states/test_user.py - tests/unit/modules/test_cmdmod.py		2018-05-23 12:33:00 -04:00
..
_ssh	pass opts to SSHClient for enable_ssh_minions	2018-02-20 16:06:00 -07:00
cloud.profiles.d	Merge branch '2017.7' into '2018.3'	2018-05-23 12:33:00 -04:00
cloud.providers.d	Merge branch '2017.7' into '2018.3'	2018-03-06 13:45:59 -05:00
cloud	Implement list_nodes_select	2016-02-10 21:39:35 +01:00
master	pass opts to SSHClient for enable_ssh_minions	2018-02-20 16:06:00 -07:00
minion	disable discovery in test suite	2018-01-11 09:58:14 -07:00
proxy	Rescue proxy_auto_tests PR from git rebase hell	2017-05-05 17:04:00 -06:00
sub_minion	Merge branch '2016.3' into 'carbon'	2016-10-21 15:50:03 -06:00
syndic	Add interface to all configs	2016-07-20 10:00:31 -06:00
syndic_master	pass opts to SSHClient for enable_ssh_minions	2018-02-20 16:06:00 -07:00