Pedro Algarvio 229eb00e8d Merge branch '2014.7' forward into develop ... Conflicts fixed. Conflicts: salt/loader.py salt/returners/carbon_return.py salt/returners/couchbase_return.py salt/returners/couchdb_return.py salt/returners/elasticsearch_return.py salt/returners/local_cache.py salt/returners/memcache_return.py salt/returners/mongo_future_return.py salt/returners/mongo_return.py salt/returners/mysql.py salt/returners/odbc.py salt/returners/postgres.py salt/returners/redis_return.py salt/returners/smtp_return.py salt/returners/sqlite3_return.py salt/states/dockerio.py salt/utils/minions.py		2014-10-19 18:21:19 +01: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' forward into develop	2014-10-19 18:21:19 +01:00
cloud.py	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00
cp.py	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00
key.py	its 'Denied Keys', not 'Denied Minions'	2014-09-24 14:10:49 +02:00
master_tops.py	Fixing pylint violations	2014-06-25 19:27:16 -04:00
master.py	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00
matcher.py	Ensure tests pass on raet and zmq	2014-07-17 10:32:07 -04:00
minion.py	fix issues with keepalive minion	2014-07-25 15:13:05 -04:00
runner.py	Better examples on tests	2014-04-24 16:04:51 +01:00
syndic.py	Remove unnecessary ©️ and :license: from file headers	2014-05-26 19:26:15 +01:00