Pedro Algarvio 9d0fe5b1d1 Merge branch '2014.7' into 2015.2 ... Conflicts: salt/modules/brew.py tests/integration/__init__.py		2015-01-11 22:40:16 +00: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	White-space lint fix	2014-07-05 00:45:53 +01: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	Switch open() for salt.utils.fopen()	2014-11-26 18:33:22 +00:00
minion.py	Merge branch '2014.7' into develop	2014-11-27 03:59:40 +00:00
runner.py	Switch open() for salt.utils.fopen()	2014-11-26 17:56:43 +00:00
syndic.py	Switch open() for salt.utils.fopen()	2014-11-26 23:37:01 +00:00