From a5586aecff4ef3a37e41da1fe86b772027130329 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Tue, 29 Mar 2011 16:36:10 +0200
Subject: [PATCH 1/2] changelog++

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 doc/changelog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/changelog b/doc/changelog
index 7faf789b..20c59b93 100644
--- 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)

From ebbacf48732ee2375a7fe8704985162ce121ed87 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Tue, 29 Mar 2011 16:41:38 +0200
Subject: [PATCH 2/2] remove unused functions

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 bin/cdist-config | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/bin/cdist-config b/bin/cdist-config
index 531f709c..eb2a8e90 100755
--- 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
 #