Nico Schottelius 79973d1582 Merge branch 'master' into install_integration ... Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: cdist/config.py cdist/emulator.py		2014-02-08 00:32:28 +01:00
..
banner	lib/cdist => cdist (pypi)	2012-10-25 17:21:58 +02:00
cdist_object	testcases emulator.OverrideTestCase, with some minor bugfixes to make	2014-02-07 14:24:12 +01:00
cdist_type	Merge branch 'master' into install_integration	2014-02-08 00:32:28 +01:00
code	fix some more tests for the next release	2013-08-28 15:44:52 +02:00
config	there is no such thing as cdist install in master	2013-08-29 21:56:53 +02:00
emulator	testcases emulator.OverrideTestCase, with some minor bugfixes to make	2014-02-07 14:24:12 +01:00
exec	implement conf-dir from CDIST_PATH environment variable	2012-11-30 16:46:17 +01:00
explorer	fix tests so that the explorers are not changed while running tests	2013-09-05 13:02:39 +02:00
fixtures/remote	only use a single space to distinguish between the actual __target_host and the same used as part of the path; fixes #206	2013-10-03 09:55:14 +02:00
manifest	out_path -> base_path	2013-08-19 12:03:25 +02:00
message	integrate messaging into cdist	2013-11-26 01:01:30 +01:00
util	lib/cdist => cdist (pypi)	2012-10-25 17:21:58 +02:00
__init__.py	setup target_host for tests in test main class	2012-11-06 21:52:11 +01:00
__main__.py	lib/cdist => cdist (pypi)	2012-10-25 17:21:58 +02:00