Colton Myers 95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/minion.py salt/modules/network.py salt/scripts.py salt/states/file.py salt/states/git.py salt/utils/event.py		2015-12-18 15:00:24 -07:00
..
conf	Also add -Z to script args for cloud tests	2015-08-24 16:11:01 -06:00
ext-conf	Move sshd_config file to another directory to avoid problems.	2014-05-12 19:06:09 +01:00
extension_modules	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
file	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-12-18 15:00:24 -07:00
file.replace	Fix tests for #18841.	2014-12-18 01:51:26 +01:00
over	remove trailing space	2013-09-01 23:40:39 -06:00
pillar/base	Add tests for nested grain/pillar matching	2013-01-26 00:13:51 -06:00
ssh	Make sure that ssh keys don't get added with incorrect encoding types.	2013-10-15 11:48:28 -06:00
ext.yaml	Add backend for initial ext_pillar tests	2012-04-08 21:31:08 -06:00
hosts	Split out integration tests from pure unit tests.	2012-02-20 13:18:13 +01:00