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
..
base	Merge branch '2017.7' into '2018.3'	2018-05-23 12:33:00 -04:00
prod	Add regression test for issue 45893	2018-02-09 11:40:22 -05:00