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
..
integration	Merge branch '2014.7' forward into develop	2014-10-19 18:21:19 +01:00
pkg/rpm	Add unity manpage to buildpackage spec	2014-09-29 13:35:50 -05:00
unit	TST: Updated mac_user tests for modifications to OS release handling	2014-10-17 09:28:56 -07:00
utils	Change expectedFailures to @skipIfs	2014-10-07 08:13:09 -06:00
__init__.py	Added utils dir and a helper for testing CherryPy apps	2014-03-29 23:20:29 -06:00
buildpackage.py	Fix --define directive for Cent5 builds	2014-09-16 18:16:44 -05:00
consist.py	Fix PEP8 E713 - test for membership should be "not in"	2014-06-06 11:25:32 +01:00
eventlisten.py	Warn if eventlisten is unable to access socket	2014-08-21 12:53:45 -04:00
jenkins-ng.py	Remove unused imports	2014-10-03 13:25:04 -06:00
jenkins.py	Remove unused imports	2014-10-03 13:25:04 -06:00
minionswarm.py	Merge pull request #14243 from cachedout/masterswarm	2014-07-15 12:22:46 -06:00
packdump.py	Add VERY simple script to read msgpack files	2014-03-20 14:31:26 -06:00
runtests.py	Removed --runner because it's integrated in the client tests	2014-10-08 01:02:10 +01:00
salt-tcpdump.py	more linting	2014-08-16 09:24:46 +02:00
saltsh.py	Minor checks to the saltsh.py repl	2014-08-07 14:24:30 -04:00
wheeltest.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00