Merge branch 'master' into modules-9315

DavidS · Jun 25, 2019 · 513a374 · 513a374
2 parents 6b60b71 + 152b986
commit 513a374
Show file tree

Hide file tree

Showing 52 changed files with 1,872 additions and 2,636 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,5 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.envrc
+/inventory.yaml
diff --git a/.pdkignore b/.pdkignore
@@ -22,6 +22,8 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.envrc
+/inventory.yaml
 /appveyor.yml
 /.fixtures.yml
 /Gemfile
@@ -30,8 +32,10 @@
 /.gitlab-ci.yml
 /.pdkignore
 /Rakefile
+/rakelib/
 /.rspec
 /.rubocop.yml
 /.travis.yml
 /.yardopts
 /spec/
+/.vscode/
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
@@ -0,0 +1 @@
+--relative