Colton Myers dc43840cee Merge branch '2014.7' into merge-forward ... Conflicts: salt/modules/glusterfs.py salt/modules/macports.py salt/modules/makeconf.py salt/modules/mdadm.py salt/modules/smartos_vmadm.py salt/modules/zypper.py salt/utils/event.py tests/integration/netapi/rest_tornado/test_app.py tests/unit/netapi/rest_tornado/test_handlers.py		2014-11-21 12:05:32 -07:00
..
cli	Switch run_ssh with run_function	2014-11-06 23:58:40 +00:00
client	Misc comment cleanup in tests	2014-10-28 08:12:10 -07:00
cloud	Remove 'running' check - it's not reliable	2014-09-23 15:06:08 -06:00
files	Merge branch '2014.7' into merge-forward	2014-11-18 12:46:29 -07: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	Use the skip_if_binaries_missing_helper	2014-11-20 16:40:38 +00:00
netapi	Merge branch '2014.7' into merge-forward	2014-11-21 12:05:32 -07:00
output	pep8	2014-10-13 15:32:11 -06:00
runners	Fix up tests	2014-11-10 15:42:45 -07: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	Merge pull request #18221 from multani/fix/git-config-set-shell-escape	2014-11-18 17:14:43 -07:00
wheel	Merge branch '2014.7' into develop	2014-10-13 20:06:17 -06:00
__init__.py	Merge branch '2014.7' into merge-forward	2014-11-21 12:05:32 -07:00