summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-01-28 12:11:43 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-01-28 12:11:43 -0800
commitc6416d5ee023f2fe7744bacf0dda35defa4ea599 (patch)
treeae62ddfe0a9e4956f55ed07ad2e3a78642965fbf
parent141f68ea536b8038f477d473b91b5bd91a4ab471 (diff)
parent7b243e06fe5ae0cdc75c63873a7987d1a2d63c03 (diff)
downloadchef-c6416d5ee023f2fe7744bacf0dda35defa4ea599.tar.gz
Merge pull request #4484 from chef/jk/chef-zero-pin
Pin chef-zero to a pre-merge SHA (will unpin shortly)
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 773a318d95..5f09eaa811 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'\""
+ env: "GEMFILE_MOD=\"gem 'chef-zero', github: 'chef/chef-zero', branch: '57f2536f25b06930dbbf3560dfc6e2b0c644af03'\""
script: bundle exec rake chef_zero_spec
- rvm: 2.2
env: "GEMFILE_MOD=\"gem 'cheffish', github: 'chef/cheffish'\""