diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-01-24 00:23:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 00:23:57 -0800 |
| commit | 099ac4b3d615a2e6600ca0bc128292e535ecd22c (patch) | |
| tree | ad74d9feab5efe310f0db4ef00b54c70b8d6f70e /Gemfile.lock | |
| parent | 144cfa2aad508ca8b014553f63b50e30f37be608 (diff) | |
| parent | ce30c4c1e008de6b9b385ebbe9bd4ab5331cb8cf (diff) | |
| download | chef-099ac4b3d615a2e6600ca0bc128292e535ecd22c.tar.gz | |
Merge branch 'master' into tduffield/fix-syntax
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7fd39d1d31..601a142dc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,10 +47,10 @@ GIT PATH remote: . specs: - chef (12.18.47) + chef (12.18.48) addressable bundler (>= 1.10) - chef-config (= 12.18.47) + chef-config (= 12.18.48) chef-zero (>= 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -76,10 +76,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.18.47-universal-mingw32) + chef (12.18.48-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.18.47) + chef-config (= 12.18.48) chef-zero (>= 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -120,7 +120,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.18.47) + chef-config (12.18.48) addressable fuzzyurl mixlib-config (~> 2.0) |