Nico Schottelius 5389d71905 Merge branch 'master' into 4.0-pre-not-stable ... Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: cdist/config.py cdist/emulator.py docs/changelog		2014-02-05 23:22:04 +01:00
..
conf	Merge branch 'master' into 4.0-pre-not-stable	2014-02-05 23:22:04 +01:00
core	Merge branch 'feature_object_override' of git://github.com/dheule/cdist	2014-01-31 21:47:23 +01:00
exec	Shell selection support via ENV	2014-01-20 20:30:37 +01:00
test	implement cdist install	2014-01-15 13:43:23 +01:00
util	missing parens -> matched what we did not want to match	2013-12-21 22:49:06 +01: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	backport ignoring install types in config mode from install_integration branch	2014-01-29 22:40:59 +01:00
emulator.py	Merge branch 'master' into 4.0-pre-not-stable	2014-02-05 23:22:04 +01:00
install.py	implement cdist install	2014-01-15 13:43:23 +01: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
preos.py	+curl	2014-01-20 09:42:53 +01:00
shell.py	Shell selection support via ENV	2014-01-20 20:30:37 +01:00