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
..
cli	Fix lint	2014-10-17 15:39:49 -07:00
client	Fix lint errors	2014-10-08 01:02:11 +01:00
cloud	Remove 'running' check - it's not reliable	2014-09-23 15:06:08 -06:00
files	Merge branch '2014.7' forward into develop	2014-10-19 18:21:19 +01:00
fileserver	Allow getting the configuration from scratch.	2014-10-08 01:00:06 +01:00
loader	Fix linode test failures and test all modules	2014-09-25 11:34:50 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge branch '2014.7' into develop	2014-10-13 20:06:17 -06:00
netapi	Add minions_denied to netapi test	2014-10-14 16:49:07 -06:00
output	pep8	2014-10-13 15:32:11 -06:00
runners	changing param back to backend in fileserver to improve useability	2014-09-22 11:16:27 -06:00
shell	Merge branch '2014.7' forward into develop	2014-10-19 18:21:19 +01:00
ssh	More Pylint	2014-05-23 15:27:19 -06:00
states	Remove reference to nonexistant function in pkg tests	2014-08-27 13:52:36 -05:00
wheel	Merge branch '2014.7' into develop	2014-10-13 20:06:17 -06:00
__init__.py	Merge branch '2014.7' into develop	2014-10-13 20:06:17 -06:00