diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-07 15:28:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 15:28:17 -0800 |
| commit | d524b98d674d047e6d9bd2fa8bedffe374979a1e (patch) | |
| tree | aa27cd80ca4ad4c6be6be2f2cec05ba0cb470042 | |
| parent | 5eb9f7286a58c3f1a7b5cd07cadc8f595f9c89ac (diff) | |
| parent | 8d5d80d333b46433eef070ab742d7b690dcccd65 (diff) | |
| download | chef-d524b98d674d047e6d9bd2fa8bedffe374979a1e.tar.gz | |
Merge pull request #5875 from chef/lcg/acceptance-testing-yak
use master of chef-config we're tesing in acceptance tests
| -rw-r--r-- | acceptance/Gemfile | 2 | ||||
| -rw-r--r-- | acceptance/Gemfile.lock | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile index 71c4f6794b..1cbc072373 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -14,3 +14,5 @@ gem "berkshelf" # Pin to 1.2.3 because current mixlib-install has a problem where unstable # packages are not always immediately available via the omnitruck API. gem "mixlib-install", "1.2.3" + +gem "chef-config", path: "../chef-config" diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index fecbc5b203..df0f6f9a32 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -6,6 +6,15 @@ GIT mixlib-shellout (~> 2.0) thor (~> 0.19) +PATH + remote: ../chef-config + specs: + chef-config (13.0.15) + addressable + fuzzyurl + mixlib-config (~> 2.0) + mixlib-shellout (~> 2.0) + GEM remote: https://rubygems.org/ specs: @@ -55,11 +64,6 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.0.1) - addressable - fuzzyurl - mixlib-config (~> 2.0) - mixlib-shellout (~> 2.0) cleanroom (1.0.0) coderay (1.1.1) diff-lcs (1.3) @@ -250,6 +254,7 @@ PLATFORMS DEPENDENCIES berkshelf chef-acceptance! + chef-config! inspec kitchen-ec2 kitchen-inspec |