Merge branch 'configurations' into indirection

Conflicts:

	lib/puppet/defaults.rb
	lib/puppet/indirector/facts/yaml.rb
	spec/unit/indirector/indirection.rb
	spec/unit/indirector/indirector.rb

1 files changed, 0 insertions, 14 deletions

diff --git a/test/data/snippets/failmissingexecpath.pp b/test/data/snippets/failmissingexecpath.pp
deleted file mode 100644
index b03875547..000000000
--- a/test/data/snippets/failmissingexecpath.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-define distloc($path) {
-    file { "/tmp/exectesting1":
-        ensure => file
-    }
-    exec { "exectest":
-        command => "touch $path",
-        subscribe => File["/tmp/exectesting1"],
-        refreshonly => true
-    }
-}
-
-distloc { yay:
-    path => "/tmp/execdisttesting",
-}