summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaymala Sinha <jsinha@chef.io>2019-09-10 00:05:13 -0400
committerJaymala Sinha <jsinha@chef.io>2019-09-10 00:05:13 -0400
commite97fb68af10516ee672c1f67a5617dc3e4dfdc91 (patch)
tree839bd9522b026af77d795f4f4545014151db7d93
parentf42271a8981f9ae9b0dbc93f9be612cf2feb4883 (diff)
downloadchef-jsinha/test_aix_rb_patch.tar.gz
Update ruby-2.6.4jsinha/test_aix_rb_patch
Signed-off-by: Jaymala Sinha <jsinha@chef.io>
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock18
-rw-r--r--omnibus_overrides.rb2
3 files changed, 11 insertions, 11 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 6fca425e62..b02f3df80f 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "jsinha/ruby_aix"
gem "artifactory"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 09d7e4f6f6..07068e1636 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,8 +18,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: b851a32e09a384cad768a6d44df267ffe920cfc2
- branch: master
+ revision: 1ad6ed7e1c8f1a60830cbec30bb7f958dd1a8675
+ branch: jsinha/ruby_aix
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -33,8 +33,8 @@ GEM
artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.208.0)
- aws-sdk-core (3.66.0)
+ aws-partitions (1.211.0)
+ aws-sdk-core (3.67.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
@@ -198,7 +198,7 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- minitar (0.8)
+ minitar (0.9)
mixlib-archive (1.0.1)
mixlib-log
mixlib-archive (1.0.1-universal-mingw32)
@@ -234,7 +234,7 @@ GEM
nori (2.6.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (15.2.5)
+ ohai (15.3.1)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -263,7 +263,7 @@ GEM
retryable (3.0.4)
ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
- rubyzip (1.2.3)
+ rubyzip (1.2.4)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
@@ -279,12 +279,12 @@ GEM
structured_warnings (0.4.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- test-kitchen (2.3.1)
+ test-kitchen (2.3.2)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11)
mixlib-install (~> 3.6)
- mixlib-shellout (>= 1.2, < 3.0)
+ mixlib-shellout (>= 1.2, < 4.0)
net-scp (>= 1.1, < 3.0)
net-ssh (>= 2.9, < 6.0)
net-ssh-gateway (>= 1.2, < 3.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 1f33f9be1f..69d4c91e3b 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -19,7 +19,7 @@ override "ncurses", version: "5.9"
override "nokogiri", version: "1.10.2"
override "openssl", version: "1.0.2s"
override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.6.3"
+override "ruby", version: "2.6.4"
override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
override "util-macros", version: "1.19.0"
override "xproto", version: "7.0.28"