Colton Myers 1a38b4b834 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/cli/salt.py salt/client/mixins.py salt/renderers/pyobjects.py		2015-04-22 11:07:01 -06:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
ext_modules.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
globals.py	Check that __context__ is always present, since it now is (properly)	2015-02-07 11:59:00 -08:00
interfaces.py	Merge #22246 with pylint fix and test cleanup	2015-04-01 10:29:23 -06:00
loader.py	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-22 11:07:01 -06:00