Merge branch 'master' into __cron-simplify

cdist/conf/type/__process/gencode-remote

@@ -25,7 +25,12 @@ else
     name="$__object_id"
 fi
 
-state_should="$(cat "$__object/parameter/state")"
+parameter_state="$__object/parameter/state"
+if [ -f "$_parameter_state" ]; then
+    state_should=(cat "$__object/parameter/state")
+else
+    state_should="present"
+fi
 
 runs="$(cat "$__object/explorer/runs")"
 if [ "$runs" ]; then

cdist/conf/type/__process/man.text

@@ -13,14 +13,11 @@ DESCRIPTION
 This cdist type allows you to define the state of a process.
 
 
-REQUIRED PARAMETERS
+OPTIONAL PARAMETERS
 -------------------
 state::
     Either "present" or "absent", defaults to "present"
 
-
-OPTIONAL PARAMETERS
--------------------
 name::
     Process name to match on when using pgrep -f -x.
 

cdist/conf/type/__process/parameter/optional

@@ -1,3 +1,4 @@
 name
 stop
 start
+state

cdist/conf/type/__process/parameter/required

@@ -1 +0,0 @@
-state

docs/changelog

@@ -14,6 +14,7 @@ next:
 	* Type __git: Missing quotes added (Chase James)
 	* Type __postgres_database: Make state parameter optional (Chase James)
 	* Type __postgres_role: Make state parameter optional, fix password bug (Chase James)
+	* Type __process: Make state parameter optional
 
 2.1.1: 2013-04-08
 	* Core: Use dynamic dependency resolver to allow indirect self dependencies