summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-01-30 13:04:52 -0800
committerTim Smith <tsmith@chef.io>2019-01-30 13:07:00 -0800
commit55df9804f9b25f0ae20c81f2d9a2160efa2e9ea2 (patch)
tree8d237fbd08cb25a9107110d7167c6fd43d557976
parent0773dfdb8b2d5f9a60057ececac5f1738d041ea5 (diff)
downloadchef-55df9804f9b25f0ae20c81f2d9a2160efa2e9ea2.tar.gz
Update rubygems to 2.7.8 and bundler to 1.17.3
Both of these have a long list of bugfixes and are the last versions before major bumps were made. We should get these new versions pulled in since we're shipping them in DK. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--omnibus/Gemfile.lock10
-rw-r--r--omnibus_overrides.rb4
2 files changed, 7 insertions, 7 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index c372f42004..ca550c9548 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -63,10 +63,10 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (10.0.2)
- chef (14.9.13)
+ chef (14.10.9)
addressable
bundler (>= 1.10)
- chef-config (= 14.9.13)
+ chef-config (= 14.10.9)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -93,10 +93,10 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.9.13-universal-mingw32)
+ chef (14.10.9-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.9.13)
+ chef-config (= 14.10.9)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -136,7 +136,7 @@ GEM
win32-taskscheduler (~> 2.0)
windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
- chef-config (14.9.13)
+ chef-config (14.10.9)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index a6d447ae95..a736a03391 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -4,8 +4,8 @@
#
# NOTE: You MUST update omnibus-software when adding new versions of
# software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
-override :rubygems, version: "2.7.6"
-override :bundler, version: "1.16.1"
+override :rubygems, version: "2.7.8"
+override :bundler, version: "1.17.3"
override "nokogiri", version: "1.10.1"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.15"