Merge branch 'master' into split_into_modules

Conflicts:
	.gitignore

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-26 09:36:36 +02:00
commit c8dc4181f6
5 changed files with 21 additions and 6 deletions

View file

@ -9,6 +9,12 @@ CORE
- allow cdist to run without $PATH setup: ./bin/cdist-deploy-to
- support non-ssh access?
TESTS
-----
- multiple defines of object:
- fail if different parameters
- succeed if same parameters
USER INTERFACE
--------------
- add support $__tmp?