diff options
| author | John Keiser <john@johnkeiser.com> | 2016-04-17 09:34:29 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-04-18 14:21:02 -0700 |
| commit | 01cf3ef2a85d3190b0bd46835ff6ae37f830764a (patch) | |
| tree | b15fc1934d56c4449101b10d074b72e26a4884e3 /kitchen-tests | |
| parent | 31f9ada8660a2831204aca436e343b6a10b103cd (diff) | |
| download | chef-01cf3ef2a85d3190b0bd46835ff6ae37f830764a.tar.gz | |
Remove Gemfile.windows and put both platforms in Gemfile.lock
Diffstat (limited to 'kitchen-tests')
| -rw-r--r-- | kitchen-tests/Gemfile.lock | 9 | ||||
| -rw-r--r-- | kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index 70f40c5235..78caba0014 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -64,9 +64,11 @@ GEM excon (0.49.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) + ffi (1.9.10-x86-mingw32) fuzzyurl (0.8.0) hashie (3.4.3) hitimes (1.2.3) + hitimes (1.2.3-x86-mingw32) httpclient (2.7.1) jmespath (1.2.4) json_pure (>= 1.8.1) @@ -88,6 +90,9 @@ GEM mixlib-versioning mixlib-log (1.6.0) mixlib-shellout (2.2.6) + mixlib-shellout (2.2.6-universal-mingw32) + win32-process (~> 0.8.2) + wmi-lite (~> 1.0) mixlib-versioning (1.1.0) molinillo (0.4.4) multi_json (1.11.2) @@ -148,9 +153,13 @@ GEM varia_model (0.4.1) buff-extensions (~> 1.0) hashie (>= 2.0.2, < 4.0.0) + win32-process (0.8.3) + ffi (>= 1.0.0) + wmi-lite (1.0.0) PLATFORMS ruby + x86-mingw32 DEPENDENCIES berkshelf diff --git a/kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock b/kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock index 4a62dbc9ab..ac6c11f28c 100644 --- a/kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock +++ b/kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock @@ -2,6 +2,7 @@ GEM remote: https://rubygems.org/ specs: ffi (1.9.10) + ffi (1.9.10-x86-mingw32) ffi-yajl (1.4.0) ffi (~> 1.5) libyajl2 (~> 1.2) @@ -9,6 +10,7 @@ GEM PLATFORMS ruby + x86-mingw32 DEPENDENCIES ffi-yajl (~> 1.1) |