Colton Myers 2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/topology/syndic.rst salt/client/__init__.py salt/daemons/masterapi.py salt/minion.py salt/modules/dockerio.py		2015-03-19 16:03:29 -06:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
arguments.py	Cleanup, the function name changed	2014-09-16 13:22:55 -07:00
auth.py	add eauth pam group tests	2015-03-17 14:25:57 -06:00
call.py	Merge branch '2014.7' into 2015.2	2015-01-11 22:40:16 +00:00
cloud.py	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00
cp.py	Add a missed with	2014-11-26 21:07:39 +00:00
key.py	Merge branch '2014.7' into develop	2014-11-27 03:59:40 +00:00
master_tops.py	Fixing pylint violations	2014-06-25 19:27:16 -04:00
master.py	Switch open() for salt.utils.fopen()	2014-11-26 23:35:31 +00:00
matcher.py	conform shell integration tests to txt runner	2015-02-17 15:40:17 -07:00
minion.py	Merge branch '2014.7' into develop	2014-11-27 03:59:40 +00:00
runner.py	conform shell integration tests to txt runner	2015-02-17 15:40:17 -07:00
syndic.py	Switch open() for salt.utils.fopen()	2014-11-26 23:37:01 +00:00