Merge remote-tracking branch 'origin/master' into leap_masterHEADmaster

1 files changed, 20 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 33bc5ff..97b306b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,26 @@
-#This file is generated by ModuleSync, do not edit.
-pkg/
-Gemfile.lock
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-.vagrant/
+#This file is generated by ModuleSync, do not edit.Z
+*.iml
+.*.sw[op]
+.DS_Store
 .bundle/
+.idea/
+.metadata
+.vagrant/
+.yardoc
+.yardwarns
+Gemfile.local
+Gemfile.lock
+bin/
 coverage/
+doc/
+junit/
 log/
-.idea/
-*.iml
+pkg/
+spec/fixtures/manifests/
+spec/fixtures/modules/
+tmp/
+vendor/
+
 !spec/fixtures/
 spec/fixtures/manifests/site.pp
 spec/fixtures/modules/*