Nico Schottelius 684ad56a80 Merge branch 'master' into notifications ... Took the __file parts from master. Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: cdist/conf/type/__file/gencode-local cdist/conf/type/__file/gencode-remote		2013-12-03 14:38:11 +01:00
..
conf	Merge branch 'master' into notifications	2013-12-03 14:38:11 +01:00
core	integrate messaging into gencode, manifest	2013-11-26 01:17:37 +01:00
exec	Merge branch 'master' into notifications	2013-12-03 14:38:11 +01:00
test	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	re-arrange REMOTE_COPY/EXEC for Shell use	2013-08-07 17:52:34 +02:00
banner.py	lib/cdist => cdist (pypi)	2012-10-25 17:21:58 +02:00
config.py	refactor so that there is no interaction between code-local and code-remote	2013-11-26 16:31:18 +01:00
emulator.py	implement configurable default values for parameters	2013-09-04 22:11:42 +02:00
log.py	+print cdist version on startup + exit_code = 2 for irq	2013-08-21 18:52:35 +02:00
message.py	update environment with messages environment	2013-12-03 14:36:38 +01:00
shell.py	fix shell from previous context change	2013-09-03 21:32:26 +02:00