rallytime 40cd0ac8fe Merge branch '2016.3' into 'develop' ... Conflicts: - salt/states/file.py - tests/runtests.py		2016-02-25 16:21:15 -07:00
..
conf	Merge branch '2016.3' into 'develop'	2016-02-25 16:21:15 -07: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 pull request #31355 from rallytime/fix-31330	2016-02-22 11:13:07 -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 integration tests for minion blackout	2016-02-19 18:04:31 -07: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