Merge branch 'master' into release

codenamephp · Dec 17, 2020 · 546a705 · 546a705
2 parents eeec8b3 + 1a5ef84
commit 546a705
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 95 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 **Merged pull requests:**
 
+- Also deleted attributes since they are not used anymore [\#39](https://github.com/codenamephp/chef.cookbook.php/pull/39) ([bastianschwarz](https://github.com/bastianschwarz))
 - Removed recipes [\#37](https://github.com/codenamephp/chef.cookbook.php/pull/37) ([bastianschwarz](https://github.com/bastianschwarz))
 - Removed XDebug 2  [\#36](https://github.com/codenamephp/chef.cookbook.php/pull/36) ([bastianschwarz](https://github.com/bastianschwarz))
 

diff --git a/attributes/5.6.rb b/attributes/5.6.rb
diff --git a/attributes/7.1.rb b/attributes/7.1.rb
diff --git a/attributes/7.2.rb b/attributes/7.2.rb
diff --git a/attributes/7.3.rb b/attributes/7.3.rb
diff --git a/attributes/7.4.rb b/attributes/7.4.rb
diff --git a/attributes/add_sury_repository.rb b/attributes/add_sury_repository.rb
diff --git a/attributes/default.rb b/attributes/default.rb
diff --git a/chefignore b/chefignore
@@ -2,10 +2,13 @@
 # or sharing to the community site.
 # Lines that start with '# ' are comments.
 
+chefignore
 *.pem
 *.pem.enc
 .travis.yml
 .chef
+.rubocop
+.typo-ci.yml
 
 # OS generated files #
 ######################
@@ -88,7 +91,7 @@ CONTRIBUTING
 CHANGELOG*
 TESTING*
 MAINTAINERS.toml
-.kitchen*.yml
+kitchen*.yml
 *.pem
 
 # Strainer #