summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-01-29 14:03:12 -0800
committerJohn Keiser <john@johnkeiser.com>2016-02-01 08:09:16 -0800
commitfce4104a51d0c64ef8eb88f3bfd3a7ac86cbd973 (patch)
treef8ca0469817d0de824e4de40bc87efe6ff03ea26 /.gitignore
parentaa8ff935688f78062ae98b37cd7d866e51ea59cd (diff)
downloadchef-fce4104a51d0c64ef8eb88f3bfd3a7ac86cbd973.tar.gz
Remove branch pin from .travis.ymljk/policies-acls
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore10
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 044899b03d..3a15888ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ tags
# You should check in your Gemfile.lock in applications, and not in gems
# This also matches Berksfile.lock
external_tests/*.lock
+acceptance/Gemfile.lock
/*.lock
/Gemfile.local
@@ -22,7 +23,14 @@ external_tests/*.lock
# http://gembundler.com/man/bundle-exec.1.html
b/
binstubs/
-
+bin
+!bin/chef-apply
+!bin/chef-client
+!bin/chef-service-manager
+!bin/chef-shell
+!bin/chef-solo
+!bin/chef-windows-service
+!bin/knife
# RVM and RBENV ruby version files
.rbenv-version
.rvmrc