Merge remote branch 'nico/master'

This commit is contained in:
Steven Armstrong 2011-03-23 20:55:55 +01:00
commit e40c497722
3 changed files with 6 additions and 5 deletions

View File

@ -43,8 +43,9 @@ while [ $# -ge 1 ]; do
|| __cdist_exit_err "Remote code failed for $object" || __cdist_exit_err "Remote code failed for $object"
# Code remote # Code remote
cdist-run-remote "$__cdist_target_host" "cdist-code-run" \ cdist-run-remote "$__cdist_target_host" \
"${__cdist_remote_out_object_base_dir}" "$object" \ "__cdist_out_object_dir=\"$__cdist_remote_out_object_base_dir\"" \
"${__cdist_name_gencode_remote}" \ "cdist-code-run" "${__cdist_remote_out_object_base_dir}" "$object" \
"${__cdist_name_gencode_remote}" \
|| __cdist_exit_err "Remote code failed for $object" || __cdist_exit_err "Remote code failed for $object"
done < "$__cdist_tmp_file" done < "$__cdist_tmp_file"

View File

@ -19,7 +19,7 @@
# #
# #
__cdist_version="1.3.2" __cdist_version="1.4.0"
# Fail if something bogus is going on # Fail if something bogus is going on
set -u set -u

View File

@ -1,4 +1,4 @@
1.4: 1.4.0:
* Add --recursive to __directory * Add --recursive to __directory
* Move cdist generated stuff to .cdist of object * Move cdist generated stuff to .cdist of object
* Allow objects to be redefined * Allow objects to be redefined