Merge remote branch 'nico/master'

14 years ago · e40c497722
parent 0356d2eeff a48e5ca8a1
commit e40c497722
3 changed files with 6 additions and 5 deletions
--- a/bin/cdist-code-run-all
+++ b/bin/cdist-code-run-all
@ -43,8 +43,9 @@ while [ $# -ge 1 ]; do
         || __cdist_exit_err "Remote code failed for $object"

   # Code remote
-   cdist-run-remote "$__cdist_target_host" "cdist-code-run" \
-      "${__cdist_remote_out_object_base_dir}" "$object"     \
+   cdist-run-remote "$__cdist_target_host"                                 \
+      "__cdist_out_object_dir=\"$__cdist_remote_out_object_base_dir\""     \
+      "cdist-code-run" "${__cdist_remote_out_object_base_dir}" "$object"   \
      "${__cdist_name_gencode_remote}"                                     \
      || __cdist_exit_err "Remote code failed for $object"
 done < "$__cdist_tmp_file"
--- a/bin/cdist-config
+++ b/bin/cdist-config
@ -19,7 +19,7 @@
 #
 #

-__cdist_version="1.3.2"
+__cdist_version="1.4.0"

 # Fail if something bogus is going on
 set -u
--- a/doc/changelog
+++ b/doc/changelog
@ -1,4 +1,4 @@
-1.4:
+1.4.0:
 	* Add --recursive to __directory
 	* Move cdist generated stuff to .cdist of object
 	* Allow objects to be redefined