summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPatrick Carlisle <patrick@puppetlabs.com>2013-05-28 14:56:09 -0700
committerPatrick Carlisle <patrick@puppetlabs.com>2013-05-28 15:03:09 -0700
commit6a2917193b56ed3e711e11cf633608864832e097 (patch)
treed9ed1fad7f6aa46f9f35676111c004f1af163d0d /.gitignore
parent81eeacec16e8dca7c26e1fe53a76f440769ea604 (diff)
downloadpuppet-6a2917193b56ed3e711e11cf633608864832e097.tar.gz
Add vendoring system into puppet
(Revert "Revert "Merge pull request #1542 from hlindberg/vendor"") This reverts commit 546dac12386865c00c172ba2e7b3f6f747434428, which had reverted the original commit adding vendoring support. We now need it.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index ad351ec17..52e93ec32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,6 @@ doc
.bundle/
ext/packaging/
pkg/
-vendor/
Gemfile.lock
-vendor/
.bundle/
puppet-acceptance/