summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-11 12:57:38 -0700
committerTim Smith <tsmith@chef.io>2018-03-11 13:57:43 -0700
commitd437bf16b91486829cfccff1898c017f6d20e085 (patch)
tree27a81c83606a4cadcc2bf8e5371e909977c67645
parent84ea1415f0a31780d3ff03de340e32af23ff62c4 (diff)
downloadchef-d437bf16b91486829cfccff1898c017f6d20e085.tar.gz
Remove duplicate files from acceptance / chef-configdedupe
Squash down to a single gitignore file and remove the readme from chef-config that date back to when it was its own repo Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.gitignore9
-rw-r--r--acceptance/.gitignore3
-rw-r--r--chef-config/.gitignore9
-rw-r--r--chef-config/README.md4
-rw-r--r--chef-config/chef-config.gemspec2
5 files changed, 10 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index 2e2447ae2c..71f9cce719 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,12 @@ kitchen-tests/vendor
# ignore nodes generated during local testing
nodes/
+
+# acceptance
+acceptance/.acceptance_logs
+acceptance/.acceptance_data
+acceptance/data-collector/Berksfile.lock
+
+# chef-config
+chef-config/.bundle
+chef-config/Gemfile.lock
diff --git a/acceptance/.gitignore b/acceptance/.gitignore
deleted file mode 100644
index 4b0b151d75..0000000000
--- a/acceptance/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.acceptance_logs
-.acceptance_data
-data-collector/Berksfile.lock
diff --git a/chef-config/.gitignore b/chef-config/.gitignore
deleted file mode 100644
index 0cb6eeb067..0000000000
--- a/chef-config/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
diff --git a/chef-config/README.md b/chef-config/README.md
deleted file mode 100644
index c36527282e..0000000000
--- a/chef-config/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# ChefConfig
-
-This repo is experimental. Use at your own risk.
-
diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index 1dc1a118ff..532b1699d7 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency(rspec, "~> 3.2")
end
- spec.files = %w{Rakefile LICENSE README.md} + Dir.glob("*.gemspec") +
+ spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +
Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
spec.bindir = "bin"