rallytime cf038ee3fe Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/grains/core.py - salt/modules/file.py - salt/modules/hosts.py - salt/modules/inspectlib/collector.py - salt/modules/portage_config.py - salt/modules/x509.py - salt/scripts.py - tests/integration/shell/enabled.py		2016-08-11 11:33:54 -06:00
..
__init__.py	Simple integration test to execute a batch command to help catch regressions	2014-07-09 15:41:18 -06:00
batch.py	Write some more simple batch command tests	2016-06-13 16:25:19 -06:00
custom_module.py	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-01 14:22:33 -06:00
grains.py	Merge branch '2015.8' into '2016.3'	2016-08-11 11:33:54 -06:00