diff options
| author | sersut <serdar@opscode.com> | 2013-05-31 14:53:17 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2013-05-31 14:53:17 -0700 |
| commit | e9ba542d3617a9264112cab4744543f662f1e7f5 (patch) | |
| tree | 9b7d88730d63238351c9c94891ca93e65abc10c7 /spec/data | |
| parent | b9640c7f8968250da6569ddb50ddb616de6c504b (diff) | |
| parent | 8d6d5ab73f5ee588cafbfc0a41ff3521eb8b1664 (diff) | |
| download | chef-e9ba542d3617a9264112cab4744543f662f1e7f5.tar.gz | |
Merge branch 'master' into file-refactor
Conflicts:
lib/chef/exceptions.rb
Diffstat (limited to 'spec/data')
| -rw-r--r-- | spec/data/cookbooks/not-nginx/attributes/default.rb | 1 | ||||
| -rw-r--r-- | spec/data/cookbooks/not-nginx/metadata.rb | 1 | ||||
| -rw-r--r-- | spec/data/git_bundles/example-repo.gitbundle | bin | 0 -> 1214 bytes | |||
| -rw-r--r-- | spec/data/kitchen/no-really-not-nginx/attributes/default.rb | 1 | ||||
| -rw-r--r-- | spec/data/kitchen/no-really-not-nginx/metadata.rb | 1 |
5 files changed, 4 insertions, 0 deletions
diff --git a/spec/data/cookbooks/not-nginx/attributes/default.rb b/spec/data/cookbooks/not-nginx/attributes/default.rb new file mode 100644 index 0000000000..be06213478 --- /dev/null +++ b/spec/data/cookbooks/not-nginx/attributes/default.rb @@ -0,0 +1 @@ +default[:cheese] = 'mr whiskers' diff --git a/spec/data/cookbooks/not-nginx/metadata.rb b/spec/data/cookbooks/not-nginx/metadata.rb new file mode 100644 index 0000000000..85e7200e2b --- /dev/null +++ b/spec/data/cookbooks/not-nginx/metadata.rb @@ -0,0 +1 @@ +name "nginx" diff --git a/spec/data/git_bundles/example-repo.gitbundle b/spec/data/git_bundles/example-repo.gitbundle Binary files differnew file mode 100644 index 0000000000..de08296dc3 --- /dev/null +++ b/spec/data/git_bundles/example-repo.gitbundle diff --git a/spec/data/kitchen/no-really-not-nginx/attributes/default.rb b/spec/data/kitchen/no-really-not-nginx/attributes/default.rb new file mode 100644 index 0000000000..7987157ec2 --- /dev/null +++ b/spec/data/kitchen/no-really-not-nginx/attributes/default.rb @@ -0,0 +1 @@ +default[:wine] = 'captain socks' diff --git a/spec/data/kitchen/no-really-not-nginx/metadata.rb b/spec/data/kitchen/no-really-not-nginx/metadata.rb new file mode 100644 index 0000000000..85e7200e2b --- /dev/null +++ b/spec/data/kitchen/no-really-not-nginx/metadata.rb @@ -0,0 +1 @@ +name "nginx" |