Merge branch '0.24.x' Removed the 'after' blocks that call Type.clear,

since that method is deprecated.

Conflicts:

	CHANGELOG
	bin/puppetca
	lib/puppet/file_serving/fileset.rb
	lib/puppet/network/xmlrpc/client.rb
	lib/puppet/type/file/selcontext.rb
	spec/unit/file_serving/metadata.rb
	spec/unit/type/file.rb

3 files changed, 23 insertions, 0 deletions

diff --git a/test/data/snippets/arithmetic_expression.pp b/test/data/snippets/arithmetic_expression.pp
new file mode 100644
index 000000000..aae98a4db
--- /dev/null
+++ b/test/data/snippets/arithmetic_expression.pp
@@ -0,0 +1,8 @@
+
+$one = 1.30
+$two = 2.034e-2
+
+$result = ((( $two + 2) / $one) + 4 * 5.45) - (6 << 7) + (0x800 + -9)
+
+
+notice("result is $result == 1295.87692307692")
\ No newline at end of file
diff --git a/test/data/snippets/emptyifelse.pp b/test/data/snippets/emptyifelse.pp
new file mode 100644
index 000000000..598b486ac
--- /dev/null
+++ b/test/data/snippets/emptyifelse.pp
@@ -0,0 +1,9 @@
+
+if false {
+} else {
+  # nothing here
+}
+
+if true {
+  # still nothing
+}
diff --git a/test/data/snippets/ifexpression.rb b/test/data/snippets/ifexpression.rb
new file mode 100644
index 000000000..eea3b855b
--- /dev/null
+++ b/test/data/snippets/ifexpression.rb
@@ -0,0 +1,6 @@
+$one = 1
+$two = 2
+
+if ($one < $two) and (($two < 3) or ($two == 2)) {
+    notice("True!")
+}