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
..
cli	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-01 14:22:33 -06:00
client	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
cloud	lint	2015-03-09 11:02:25 -06:00
files	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-03-20 20:09:19 -06:00
fileserver	Pylint fix - remove unused import	2015-02-11 09:35:04 -07:00
loader	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-01 14:22:33 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-01 14:22:33 -06:00
netapi	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-03-19 16:13:16 -06:00
output	Merge branch '2015.2' into develop	2015-02-27 10:02:47 +00:00
runners	Merge branch '2015.2' into 2015.2-develop	2015-03-10 17:47:30 -05:00
shell	Lint (blank lines)	2015-03-21 15:36:04 -06:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge branch '2015.2' into 2015.2-develop	2015-03-10 17:47:30 -05:00
utils	cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"	2015-01-28 18:43:43 -08:00
wheel	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
__init__.py	More helper text, refactor filehandles, clean up	2015-03-13 16:15:23 -06:00