From ff4faa3a77aebd38d6629827ba388a5731a0ccf1 Mon Sep 17 00:00:00 2001 From: David Hollinger III Date: Thu, 12 Jan 2017 09:50:05 -0600 Subject: [PATCH 1/2] Add the new puppet-specific files from Rubymine Rubymine is rolling out improved Puppet support for their 2017.1 release. With this comes some new files we will want to keep out of our repos in case any contributor is using Rubymine. Added .dependencies/, .librarian/, and Puppetfile.lock --- moduleroot/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/moduleroot/.gitignore b/moduleroot/.gitignore index 589ab651..4cd7fc97 100644 --- a/moduleroot/.gitignore +++ b/moduleroot/.gitignore @@ -10,6 +10,9 @@ spec/fixtures/modules/ coverage/ log/ .idea/ +.dependencies/ +.librarian/ +.Puppetfile.lock *.iml .*.sw? .yardoc/ From e4bf3459b11d3f20ad88916bb526321e7f3abe3a Mon Sep 17 00:00:00 2001 From: David Hollinger III Date: Thu, 12 Jan 2017 09:56:17 -0600 Subject: [PATCH 2/2] Remove '.' preceding Puppetfile.lock --- moduleroot/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moduleroot/.gitignore b/moduleroot/.gitignore index 4cd7fc97..0d434607 100644 --- a/moduleroot/.gitignore +++ b/moduleroot/.gitignore @@ -12,7 +12,7 @@ log/ .idea/ .dependencies/ .librarian/ -.Puppetfile.lock +Puppetfile.lock *.iml .*.sw? .yardoc/