Colton Myers 0b7ac988cc Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: .pylintrc salt/beacons/service.py salt/beacons/sh.py salt/modules/cassandra_cql.py salt/returners/cassandra_cql_return.py		2015-04-01 14:22:33 -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	Adjust batch test	2015-02-27 14:53:58 -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	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00