Colton Myers 2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/topology/syndic.rst salt/client/__init__.py salt/daemons/masterapi.py salt/minion.py salt/modules/dockerio.py		2015-03-19 16:03:29 -06:00
..
conf	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-19 16:03:29 -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 regression test for master_tops	2014-06-25 14:53:11 -04:00
file	Pylint fix	2015-03-06 17:47:18 -08: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