rallytime 180c03ca24 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cli/salt.py - salt/modules/zypper.py - salt/scripts.py - salt/states/boto_elb.py - tests/integration/states/user.py - tests/unit/states/file_test.py		2016-05-06 09:20:05 -06:00
..
conf	Merge branch '2015.8' into '2016.3'	2016-02-25 12:36:22 -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 branch '2015.8' into '2016.3'	2016-05-06 09:20:05 -06:00
file.replace	Fix tests for #18841.	2014-12-18 01:51:26 +01:00
over	Remove trailing white spaces in tests files	2016-03-01 17:40:02 +02: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