From 9346b108ce7996bcb363a94d84d087984d74bc86 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@dasz.at>
Date: Wed, 14 Aug 2013 10:33:39 +0200
Subject: (PUP-636) Ignore generated file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 2e3ca63..690e67e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ spec/fixtures/
 Gemfile.lock
 .bundle/
 vendor/bundle/
+/metadata.json
-- 
cgit v1.2.3


From ff47b2e0400991a7134a9e3c67d89562b3c76426 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Mon, 3 Mar 2014 17:47:04 +0000
Subject: Prepare for supported modules.

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 690e67e..7d0fd8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
 pkg/
 .DS_Store
-metadata.json
 coverage/
 spec/fixtures/
 Gemfile.lock
 .bundle/
 vendor/bundle/
-/metadata.json
-- 
cgit v1.2.3


From 2fefd9c1e0249daebd327ca6e1ee3d791257e663 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 25 Jun 2014 18:00:57 -0700
Subject: Sync files

---
 .gitignore | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 7d0fd8d..b5b7a00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 pkg/
-.DS_Store
-coverage/
-spec/fixtures/
 Gemfile.lock
+vendor/
+spec/fixtures/
+.vagrant/
 .bundle/
-vendor/bundle/
+coverage/
-- 
cgit v1.2.3


From 9077bfef1e3313b7cd7f89cfec95132466730325 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 29 Dec 2014 10:41:22 -0800
Subject: Add IntelliJ files to the ignore list

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index b5b7a00..b5db85e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+.idea/
+*.iml
-- 
cgit v1.2.3