summaryrefslogtreecommitdiff
path: root/spec/data
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2013-07-03 07:39:59 -0700
committerBryan McLellan <btm@opscode.com>2013-07-03 07:39:59 -0700
commit39f8848aac823bbd2c5186e0454da3a0fb8e8b0e (patch)
treef938f9b84ab0bd96e3f7e21b79d34b6859eadc3a /spec/data
parent302c3c6cdf592a677d957975a9d2dc31435e12a8 (diff)
downloadchef-39f8848aac823bbd2c5186e0454da3a0fb8e8b0e.tar.gz
Revert "Merge branch 'CHEF-3307'"
This reverts commit 5713a002062c762e40e4378be6d7763eb3dd61a2, reversing changes made to 4079a344f2001c1927132e7ed6b63453f459609f. Conflicts: spec/unit/cookbook_loader_spec.rb
Diffstat (limited to 'spec/data')
-rw-r--r--spec/data/cookbooks/not-nginx/attributes/default.rb1
-rw-r--r--spec/data/cookbooks/not-nginx/metadata.rb1
-rw-r--r--spec/data/kitchen/no-really-not-nginx/attributes/default.rb1
-rw-r--r--spec/data/kitchen/no-really-not-nginx/metadata.rb1
4 files changed, 0 insertions, 4 deletions
diff --git a/spec/data/cookbooks/not-nginx/attributes/default.rb b/spec/data/cookbooks/not-nginx/attributes/default.rb
deleted file mode 100644
index be06213478..0000000000
--- a/spec/data/cookbooks/not-nginx/attributes/default.rb
+++ /dev/null
@@ -1 +0,0 @@
-default[:cheese] = 'mr whiskers'
diff --git a/spec/data/cookbooks/not-nginx/metadata.rb b/spec/data/cookbooks/not-nginx/metadata.rb
deleted file mode 100644
index 85e7200e2b..0000000000
--- a/spec/data/cookbooks/not-nginx/metadata.rb
+++ /dev/null
@@ -1 +0,0 @@
-name "nginx"
diff --git a/spec/data/kitchen/no-really-not-nginx/attributes/default.rb b/spec/data/kitchen/no-really-not-nginx/attributes/default.rb
deleted file mode 100644
index 7987157ec2..0000000000
--- a/spec/data/kitchen/no-really-not-nginx/attributes/default.rb
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 85e7200e2b..0000000000
--- a/spec/data/kitchen/no-really-not-nginx/metadata.rb
+++ /dev/null
@@ -1 +0,0 @@
-name "nginx"