Merge remote-tracking branch 'sans/executionorder'

14 years ago · 5f1623dd1c
parent 8bd52b9065 ebbacf4873
commit 5f1623dd1c
2 changed files with 5 additions and 11 deletions
--- a/bin/cdist-config
+++ b/bin/cdist-config
@ -185,16 +185,6 @@ __cdist_init_deploy()
   ln -sf "$__cdist_conf_dir" "$__cdist_local_base_dir/$__cdist_name_conf_dir"
 }

-__cdist_new_objects_created()
-{
-   touch "$__cdist_tmp_dir/object_created"
-}
-
-__cdist_has_new_objects()
-{
-   touch "$__cdist_tmp_dir/object_created"
-}
-
 ################################################################################
 # Object
 #
--- a/doc/changelog
+++ b/doc/changelog
@ -1,7 +1,11 @@
 1.5.0:
 	* Add cache functionality
 	* New type __process
-	* Restructured execution: Run whole object at once (REPHRASE) (Steven Armstrong)
+	* Restructured execution: (Steven Armstrong)
+		Process each object as a whole, resolve dependencies and ensure
+		correct execution order.
+	* Documentation: Rewrite stages docs
+	* Documentation: Remove legacy man pages

 1.4.1: 2011-03-25
 	* New type __key_value (Steven Armstrong)