summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-06-14 16:38:46 -0700
committerGitHub <noreply@github.com>2019-06-14 16:38:46 -0700
commit6e539acc1bf28d7bd6e773e53444188ef8dcbe03 (patch)
tree68a82c5db471a3b0eced0c1019444f6542a84841
parent1d9210c520aa4d3453571703ef133b6b635ab79d (diff)
parent3e573ca0cbbd053ff07ad7e4d72f16a1708e2eb3 (diff)
downloadchef-6e539acc1bf28d7bd6e773e53444188ef8dcbe03.tar.gz
Merge pull request #8665 from chef/update_omni
Update omnibus-software to unbreak chef builds
-rw-r--r--Gemfile.lock2
-rw-r--r--omnibus/Gemfile.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 29f27f4136..93cc006286 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: d1a25fa525a4760609642d244cc729a46aa194ce
+ revision: 570fb2f076a420cab1e793e6849f80d2ba32722b
branch: master
specs:
ohai (15.1.3)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f609644be8..f922fef519 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 5cf947c96ffb97b0771df43c18190dbedac7f3a1
+ revision: 5a7c68f463b2b2cf553730ba146d5f512089d501
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,8 +32,8 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.174.0)
- aws-sdk-core (3.54.2)
+ aws-partitions (1.175.0)
+ aws-sdk-core (3.55.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
@@ -233,7 +233,7 @@ GEM
nori (2.6.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (15.0.35)
+ ohai (15.1.3)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)