Merge branch 'master' into install

2011-10-06 16:55:05 +02:00 · 2011-10-06 16:55:05 +02:00 · 11e34810e7
commit 11e34810e7
parent 1c8a143397 8341e0cc0f
5 changed files with 4 additions and 0 deletions
--- a/other/types_pending_inclusion/__init_script/README
+++ b/other/types_pending_inclusion/__init_script/README
@ -0,0 +1,4 @@
 Moved out of conf/type/ to think about whether this type makes sense or not.
 Cdist describes the state and using an init_script may be useful, but
 should only be used conditionally.
--- a/other/types_pending_inclusion/__init_script/gencode-remote
+++ b/other/types_pending_inclusion/__init_script/gencode-remote
--- a/other/types_pending_inclusion/__init_script/man.text
+++ b/other/types_pending_inclusion/__init_script/man.text
--- a/other/types_pending_inclusion/__init_script/parameter/optional
+++ b/other/types_pending_inclusion/__init_script/parameter/optional
--- a/other/types_pending_inclusion/__init_script/parameter/required
+++ b/other/types_pending_inclusion/__init_script/parameter/required