summaryrefslogtreecommitdiffstats
path: root/test/data
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-09-23 22:31:55 -0500
committerLuke Kanies <luke@madstop.com>2008-09-23 22:31:55 -0500
commit4aeabbbb2163684ff7064198c653cd60d46e5717 (patch)
tree7c3593bde6b7f28f3e20444a576eb37338cced14 /test/data
parent5b9dd01326a61b9ae89ae978e29a8170f76deb5e (diff)
parent8d5ded09b9c9c944695c015e6e95b10ccebd6fb5 (diff)
downloadpuppet-4aeabbbb2163684ff7064198c653cd60d46e5717.tar.gz
puppet-4aeabbbb2163684ff7064198c653cd60d46e5717.tar.xz
puppet-4aeabbbb2163684ff7064198c653cd60d46e5717.zip
Merge branch '0.24.x'
Conflicts: lib/puppet/metatype/container.rb lib/puppet/metatype/instances.rb lib/puppet/metatype/metaparams.rb lib/puppet/metatype/relationships.rb lib/puppet/metatype/schedules.rb
Diffstat (limited to 'test/data')
-rw-r--r--test/data/snippets/append.pp11
1 files changed, 11 insertions, 0 deletions
diff --git a/test/data/snippets/append.pp b/test/data/snippets/append.pp
new file mode 100644
index 000000000..28edeb177
--- /dev/null
+++ b/test/data/snippets/append.pp
@@ -0,0 +1,11 @@
+$var=['/tmp/file1','/tmp/file2']
+
+class arraytest {
+ $var += ['/tmp/file3', '/tmp/file4']
+ file {
+ $var:
+ content => "test"
+ }
+}
+
+include arraytest