rallytime 0e332ab591 Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/cli/batch.py - salt/cli/salt.py - salt/transport/client.py - salt/utils/vmware.py - tests/integration/modules/sysmod.py		2016-11-14 09:14:00 -07: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	Merge branch '2016.3' into '2016.11'	2016-11-14 09:14:00 -07: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-09-29 09:15:26 -06:00