summaryrefslogtreecommitdiff
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
parentaa8ff935688f78062ae98b37cd7d866e51ea59cd (diff)
downloadchef-fce4104a51d0c64ef8eb88f3bfd3a7ac86cbd973.tar.gz
Remove branch pin from .travis.ymljk/policies-acls
-rw-r--r--.gitignore10
-rw-r--r--.travis.yml2
2 files changed, 10 insertions, 2 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
diff --git a/.travis.yml b/.travis.yml
index b95c2f0d75..be50c6bea4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ matrix:
sudo: true
bundler_args: --without server docgen maintenance
- rvm: 2.2
- env: "GEMFILE_MOD=\"gem 'chef-zero', github: 'chef/chef-zero', branch: '57f2536f25b06930dbbf3560dfc6e2b0c644af03'\""
+ env: "GEMFILE_MOD=\"gem 'chef-zero', github: 'chef/chef-zero'\""
script: bundle exec rake chef_zero_spec
- rvm: 2.2
env: "GEMFILE_MOD=\"gem 'cheffish', github: 'chef/cheffish'\""