summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Preston <stuart@chef.io>2018-07-24 13:44:10 +0100
committerGitHub <noreply@github.com>2018-07-24 13:44:10 +0100
commit02ea1d785b22107dd5e04240ef523b080250758d (patch)
tree5bec93009fe8bedf3961c31e7df035ee2beb7502
parent0584508ea354dade2d3df419d98b5171ff82fb2e (diff)
parent0ec17006d66a0501850924937647bc1f97b4a211 (diff)
downloadchef-02ea1d785b22107dd5e04240ef523b080250758d.tar.gz
Merge pull request #7504 from MsysTechnologiesllc/vasundhara/bump_deps
Bump dependencies to fix failing functional test for windows_task
-rw-r--r--Gemfile.lock10
-rw-r--r--omnibus/Gemfile.lock16
2 files changed, 13 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 72a223e739..6d29f3d4f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -149,7 +149,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (2.2.35)
+ inspec-core (2.2.41)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -182,8 +182,8 @@ GEM
mixlib-config (2.2.13)
tomlrb
mixlib-log (2.0.4)
- mixlib-shellout (2.3.2)
- mixlib-shellout (2.3.2-universal-mingw32)
+ mixlib-shellout (2.4.0)
+ mixlib-shellout (2.4.0-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
multi_json (1.13.1)
@@ -339,13 +339,13 @@ GEM
win32-service (1.0.1)
ffi
ffi-win32-extensions
- win32-taskscheduler (1.0.9)
+ win32-taskscheduler (1.0.10)
ffi
structured_warnings
windows-api (0.4.4)
win32-api (>= 1.4.5)
wmi-lite (1.0.0)
- yard (0.9.14)
+ yard (0.9.15)
PLATFORMS
ruby
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bdbf0fd698..9519ea3589 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 836bd650d49e6350dfa40b43a1398c5847a6fd42
+ revision: d48afdf29dd9c9d0562656675d1036cd035c2a46
branch: master
specs:
omnibus-software (4.0.0)
@@ -31,13 +31,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.11.90)
- aws-sdk-resources (= 2.11.90)
- aws-sdk-core (2.11.90)
+ aws-sdk (2.11.93)
+ aws-sdk-resources (= 2.11.93)
+ aws-sdk-core (2.11.93)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.90)
- aws-sdk-core (= 2.11.90)
+ aws-sdk-resources (2.11.93)
+ aws-sdk-core (= 2.11.93)
aws-sigv4 (1.0.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -135,8 +135,8 @@ GEM
mixlib-versioning
thor
mixlib-log (1.7.1)
- mixlib-shellout (2.3.2)
- mixlib-shellout (2.3.2-universal-mingw32)
+ mixlib-shellout (2.4.0)
+ mixlib-shellout (2.4.0-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.2.2)