diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2017-04-04 10:46:03 -0700 |
|---|---|---|
| committer | Noah Kantrowitz <noah@coderanger.net> | 2017-04-04 10:46:03 -0700 |
| commit | bd7f7d1b07cbb19c9d08c273bc857a084ce4689b (patch) | |
| tree | 2060470383da4712acade2f6719572c00fc054b1 /Gemfile.lock | |
| parent | dbb339175b445bcd4dfd6c54bababf9dd7908993 (diff) | |
| parent | 93c72873224c6a79ae13b5d2fa70cb9bfc645c5c (diff) | |
| download | chef-bd7f7d1b07cbb19c9d08c273bc857a084ce4689b.tar.gz | |
Merge branch 'master' into template-lazy
Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 32fb91889e..11e8191d15 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: 867fb0245d5c162195cdf33f9e923c732cf512c3 + revision: b670bd5f2ed1f56a39ab0c211efd4204b6978422 specs: oc-chef-pedant (2.2.0) activesupport (>= 4.2.7.1, < 6.0) @@ -37,7 +37,7 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: 58296dc0035e4f94a7b7cdc1db01887a3c3c1e30 + revision: 21cc711810e860d9db378f39da88406eec48d878 specs: ohai (13.0.0) chef-config (>= 12.5.0.alpha.1, < 14) @@ -117,7 +117,7 @@ PATH addressable bundler (>= 1.10) chef-config (= 13.0.92) - chef-zero (>= 4.8) + chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi-yajl (~> 2.2) @@ -146,7 +146,7 @@ PATH addressable bundler (>= 1.10) chef-config (= 13.0.92) - chef-zero (>= 4.8) + chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi (~> 1.9) @@ -222,14 +222,14 @@ GEM logify (~> 0.1) mime-types chef-sugar (3.4.0) - chef-zero (5.3.2) + chef-zero (13.0.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack (~> 2.0) uuidtools (~> 2.1) - cheffish (5.0.1) - chef-zero (~> 5.0) + cheffish (13.0.0) + chef-zero (~> 13.0) net-ssh chefspec (5.4.0) chef (>= 12.0) @@ -571,7 +571,7 @@ DEPENDENCIES chef! chef-config! chef-sugar - cheffish + cheffish (~> 13) chefspec chefstyle! cucumber (>= 2.4.0) |