Merge branch '0.24.x' into merging

Conflicts:

	test/ral/type/filesources.rb

1 files changed, 20 insertions, 0 deletions

diff --git a/examples/nodes b/examples/nodes
new file mode 100644
index 000000000..42488e689
--- /dev/null
+++ b/examples/nodes
@@ -0,0 +1,20 @@
+# $Id$
+
+# define nodes
+
+#service.setpath("../examples/root/etc/init.d")
+
+Service {
+    path => "../examples/root/etc/init.d"
+}
+
+import "classing"
+
+sleepserver {
+    path => $operatingsystem ? {
+        sunos => "../examples/root/etc/configfile",
+        hpux => "../examples/other/etc/configfile",
+        default => "../examples/root/etc/configfile"
+    },
+    schedule => true
+}