rallytime 08c71f13e4 Merge branch '2017.7' into 'oxygen' ... Conflicts: - doc/ref/configuration/minion.rst - doc/topics/thorium/index.rst - salt/beacons/__init__.py - salt/client/mixins.py - salt/client/ssh/wrapper/state.py - salt/daemons/masterapi.py - salt/grains/extra.py - salt/minion.py - salt/modules/cron.py - salt/modules/file.py - salt/modules/mac_user.py - salt/modules/napalm_network.py - salt/modules/state.py - salt/modules/win_file.py - salt/modules/win_pkg.py - salt/proxy/dummy.py - salt/state.py - salt/states/file.py - salt/states/lxc.py - salt/utils/__init__.py - salt/utils/schedule.py - tests/integration/modules/test_file.py - tests/integration/modules/test_groupadd.py - tests/integration/ssh/test_state.py - tests/integration/states/test_file.py - tests/unit/daemons/test_masterapi.py - tests/unit/grains/test_core.py - tests/unit/modules/test_disk.py - tests/unit/modules/test_napalm_network.py - tests/unit/modules/test_state.py - tests/unit/test_minion.py - tests/unit/utils/test_process.py		2017-12-11 18:24:41 -05:00
..
index.rst	Merge branch '2017.7' into 'oxygen'	2017-12-11 18:24:41 -05:00