rallytime 1fe0b69a6c Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/blockdev.py - salt/modules/ddns.py - salt/modules/inspectlib/collector.py - salt/modules/linux_sysctl.py - salt/modules/status.py - salt/modules/x509.py - salt/utils/process.py - salt/utils/verify.py - tests/integration/__init__.py - tests/integration/modules/state.py - tests/integration/states/cmd.py		2016-08-12 16:21:58 -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	Pylint fix	2016-08-02 14:23:20 -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