Merge branch 'master' into split_into_modules

Conflicts:
	.gitignore

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>

.gitignore

@@ -11,8 +11,8 @@ doc/man/man7/cdist-type__*.text
 doc/man/man7/cdist-reference.text
 doc/man/man*/docbook-xsl.css
 
-# Ignore cache for version control
-cache/
+# Ignore cdist cache for version control
+/cache/
 
-# Python
-**/__pycache__/
+# Python / cache
+__pycache__/

README

@@ -78,6 +78,7 @@ cdist was tested or is know to run on at least
  * A posix like shell
  * Python (>= 3.2 required)
  * SSH-Client
+ * Asciidoc (for building the manpages)
 
 ### Client ("target host")
 
@@ -98,7 +99,7 @@ To install cdist, execute the following commands:
     cd cdist
     export PATH=$PATH:$(pwd -P)/bin
 
-    # If you want the manpages (requires gmake and asciidoc to be installed)
+    # If you want the manpages
     ./build.sh man
     export MANPATH=$MANPATH:$(pwd -P)/doc/man
 

conf/explorer/os

@@ -65,8 +65,13 @@ if [ -f /etc/SuSE-release ]; then
    exit 0
 fi
 
+if uname -r | grep -s '.owl' >/dev/null 2>&1; then
+   echo owl
+   exit 0
+fi
+
 if [ -f /etc/cdist-preos ]; then
-   echo preos
+   echo cdist-preos
    exit 0
 fi
 

doc/changelog

@@ -1,3 +1,6 @@
+2.0.2:
+	* Add support for detection of OpenWall Linux (Matthias Teege)
+
 2.0.1: 2011-09-23
 	* Bugfix core: Always print source of error in case of exec errors
 	* Bugfix core: Various smaller bugs in string concatenation

doc/dev/todo/TAKEME

@@ -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?