Merge branch '3.0' into 4.0-pre-not-stable

docs/changelog

@@ -9,8 +9,19 @@ Changelog
 	* Core: Integrate initial preos support
 
 
-3.0.9:
+3.0.9: 2014-02-14
+	* Core: Ignore order dependencies if override is set (Daniel Heule)
+	* Core: Improve Mac OS X support for unit tests (Steven Armstrong)
 	* Type __locale: Error out in case of unsupported OS
+	* Type __jail: Use default parameters for state (Daniel Heule)
+	* Type __pf_ruleset: Use default parameters for state (Daniel Heule)
+	* Type __postgres_database: Use default parameters for state (Daniel Heule)
+	* Type __postgres_role: Use default parameters for state (Daniel Heule)
+	* Type __rvm: Use default parameters for state (Daniel Heule)
+	* Type __rvm_gem: Use default parameters for state (Daniel Heule)
+	* Type __rvm_gemset: Use default parameters for state (Daniel Heule)
+	* Type __rvm_ruby: Use default parameters for state (Daniel Heule)
+
 
 3.0.8: 2014-02-11
 	* Core: Enhance object id verification (Daniel Heule)

docs/man/cdist-reference.text.sh

@@ -236,7 +236,7 @@ The following environment variables influence the behaviour of cdist:
 require::
     Setup dependencies between objects (see cdist-manifest(7))
 
-CDIST_ALLOW_OVERRIDE::
+CDIST_OVERRIDE::
     Allow overwriting type parameters (see cdist-manifest(7))
 
 CDIST_ORDER_DEPENDENCY::

docs/man/man7/cdist-manifest.text

@@ -152,6 +152,10 @@ ATTENTION: Only use this feature if you are 100% sure in which order
 cdist encounter the affected objects, otherwhise this results 
 into an undefined situation. 
 
+If CDIST_OVERRIDE and CDIST_ORDER_DEPENDENCY is set for an object,
+CDIST_ORDER_DEPENDENCY will be ignored, because adding a dependency in case of
+overrides would result in circular dependencies, which is an error.
+
 THIS IS A BETA FEATURE AND MAY BE REMOVED OR CHANGED AT ANY TIME.