Merge remote-tracking branch 'telmich/master'

2015-02-24 23:14:49 +01:00 · 2015-02-24 23:14:49 +01:00 · 2677130e0c
commit 2677130e0c
parent 44d57497e0 f222414c1a
1 changed files with 0 additions and 1 deletions
--- a/cdist/conf/type/__consul_agent/manifest
+++ b/cdist/conf/type/__consul_agent/manifest
@ -82,7 +82,6 @@ echo "{"

 # parameters we define ourself
 printf '   "data_dir": "%s"\n' "$data_dir"
-printf '   ,"config_dir": "%s"\n' "$conf_dir"

 for param in $(ls "$__object/parameter/"); do
   case "$param" in