From 1229d5a831995ddc2c9814f5104ea2a2c9df65a9 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 19 Jan 2017 16:17:47 -0800
Subject: (MODULES-4098) Sync the rest of the files

---
 .gitignore | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to '.gitignore')

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


From 81ab03e0ad8ad8710d454f8185985d03a31f8493 Mon Sep 17 00:00:00 2001
From: Hailee Kenney <hailee@puppetlabs.com>
Date: Mon, 18 Sep 2017 14:57:28 -0700
Subject: (maint) modulesync 892c4cf

---
 .gitignore | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to '.gitignore')

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