diff options
| author | Tim Smith <tsmith@chef.io> | 2020-01-21 10:08:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 10:08:08 -0800 |
| commit | 88444e0beddedc5d66b0cebc844e68e5a39524ee (patch) | |
| tree | 28266d4ce4e56317e93306e14544669cf95b309a | |
| parent | f154e2a113499b75ec48ea4118aa65292834b8f5 (diff) | |
| parent | e5d9f51498f12e9ec8a25bd5c101050f2a4b8eba (diff) | |
| download | chef-88444e0beddedc5d66b0cebc844e68e5a39524ee.tar.gz | |
Merge pull request #9237 from chef/bump-16
Bump to Chef Infra Client 16
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 4 |
6 files changed, 10 insertions, 9 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index e91343a89e..c5b5c83e06 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -60,6 +60,8 @@ github: # for building. release_branch: - master: + version_constraint: 16* + - chef-15: version_constraint: 15* - chef-14: version_constraint: 14* @@ -7,7 +7,6 @@ source "https://rubygems.org" # of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed) gem "chef", path: "." -# necessary until we release ohai 15 gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" gem "chef-utils", path: File.expand_path("../chef-utils", __FILE__) if File.exist?(File.expand_path("../chef-utils", __FILE__)) diff --git a/Gemfile.lock b/Gemfile.lock index 02eff9a8ab..514a62a423 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: 79b17080b9596096633f85c96305bda766d3ba60 + revision: f0ac4a7a505523180a44f7edb25a3d294da8d184 branch: master specs: - ohai (15.7.3) + ohai (16.0.0) chef-config (>= 12.8, < 16) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -51,7 +51,7 @@ PATH net-sftp (~> 2.1, >= 2.1.2) net-ssh (>= 4.2, < 6) net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (~> 15.0) + ohai (~> 16.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) @@ -84,7 +84,7 @@ PATH net-sftp (~> 2.1, >= 2.1.2) net-ssh (>= 4.2, < 6) net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (~> 15.0) + ohai (~> 16.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) @@ -1 +1 @@ -15.7.24
\ No newline at end of file +16.0.0
\ No newline at end of file diff --git a/chef.gemspec b/chef.gemspec index 3e2928d504..881dbb55ec 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-authentication", ">= 2.1", "< 4" s.add_dependency "mixlib-shellout", ">= 3.0.3", "< 4.0" s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" - s.add_dependency "ohai", "~> 15.0" + s.add_dependency "ohai", "~> 16.0" s.add_dependency "ffi", "~> 1.9", ">= 1.9.25" s.add_dependency "ffi-yajl", "~> 2.2" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 89617a70c4..cc2cea1887 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -32,7 +32,7 @@ GEM artifactory (3.0.12) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.264.0) + aws-partitions (1.266.0) aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -242,7 +242,7 @@ GEM octokit (4.15.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (15.6.3) + ohai (15.7.3) chef-config (>= 12.8, < 16) ffi (~> 1.9) ffi-yajl (~> 2.2) |