summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml20
-rw-r--r--CHANGELOG.md11
-rw-r--r--Gemfile.lock16
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef.gemspec2
-rw-r--r--lib/chef/resource/timezone.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock12
-rw-r--r--omnibus_overrides.rb8
10 files changed, 35 insertions, 42 deletions
diff --git a/.travis.yml b/.travis.yml
index b918dfe7d3..d5d1a7d707 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,38 +35,18 @@ env:
matrix:
include:
- env:
- INTEGRATION_SPECS_24: 1
- rvm: 2.4.5
- sudo: true
- script: sudo -E $(which bundle) exec rake spec:integration;
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
- - env:
INTEGRATION_SPECS_25: 1
rvm: 2.5.3
sudo: true
script: sudo -E $(which bundle) exec rake spec:integration;
bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
- env:
- FUNCTIONAL_SPECS_24: 1
- rvm: 2.4.5
- sudo: true
- script: sudo -E $(which bundle) exec rake spec:functional;
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
- - env:
FUNCTIONAL_SPECS_25: 1
rvm: 2.5.3
sudo: true
script: sudo -E $(which bundle) exec rake spec:functional;
bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
- env:
- UNIT_SPECS_24: 1
- rvm: 2.4.5
- sudo: true
- script:
- - sudo -E $(which bundle) exec rake spec:unit;
- - sudo -E $(which bundle) exec rake component_specs
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
- - env:
UNIT_SPECS_25: 1
rvm: 2.5.3
sudo: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df3ee0b76c..61640848ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,20 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.96 -->
-## [v15.0.96](https://github.com/chef/chef/tree/v15.0.96) (2018-11-30)
+<!-- latest_release 15.0.101 -->
+## [v15.0.101](https://github.com/chef/chef/tree/v15.0.101) (2018-12-06)
#### Merged Pull Requests
-- RHEL8 yum_package fix. [#8005](https://github.com/chef/chef/pull/8005) ([lamont-granquist](https://github.com/lamont-granquist))
+- Require Ruby 2.5 or later [#8023](https://github.com/chef/chef/pull/8023) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Require Ruby 2.5 or later [#8023](https://github.com/chef/chef/pull/8023) ([tas50](https://github.com/tas50)) <!-- 15.0.101 -->
+- timezone: updated description to include windows [#8018](https://github.com/chef/chef/pull/8018) ([Stromweld](https://github.com/Stromweld)) <!-- 15.0.100 -->
+- Update InSpec to 3.0.61 and Ohai to 15.0.20 [#8010](https://github.com/chef/chef/pull/8010) ([tas50](https://github.com/tas50)) <!-- 15.0.99 -->
+- Fix locking ohai to to the value in the Gemfile.lock [#8014](https://github.com/chef/chef/pull/8014) ([tas50](https://github.com/tas50)) <!-- 15.0.98 -->
+- Pin the ohai definition to use the ohai version from Gemfile.lock [#8012](https://github.com/chef/chef/pull/8012) ([tas50](https://github.com/tas50)) <!-- 15.0.97 -->
- RHEL8 yum_package fix. [#8005](https://github.com/chef/chef/pull/8005) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.96 -->
- package resource: Add RHEL 8 support to DNF package installer [#8003](https://github.com/chef/chef/pull/8003) ([pixdrift](https://github.com/pixdrift)) <!-- 15.0.95 -->
- Initial suppport for snap packages [#7999](https://github.com/chef/chef/pull/7999) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.94 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fea970ac89..0b8d9118a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 878d3ff1eb9998ee921d599aafed27ded235695e
+ revision: dbbd71fd79de6f03492e69936467412c43463a4e
branch: master
specs:
- ohai (15.0.14)
+ ohai (15.0.25)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.96)
+ chef (15.0.101)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.96)
+ chef-config (= 15.0.101)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.96-universal-mingw32)
+ chef (15.0.101-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.96)
+ chef-config (= 15.0.101)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.96)
+ chef-config (15.0.101)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -167,7 +167,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (3.0.52)
+ inspec-core (3.0.61)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
diff --git a/VERSION b/VERSION
index 73119ad422..deca406a10 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.96 \ No newline at end of file
+15.0.101 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6644877fd1..8602151c9d 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.0.96".freeze
+ VERSION = "15.0.101".freeze
end
#
diff --git a/chef.gemspec b/chef.gemspec
index c787e00580..15fc862deb 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.email = "adam@chef.io"
s.homepage = "https://www.chef.io"
- s.required_ruby_version = ">= 2.4.0"
+ s.required_ruby_version = ">= 2.5.0"
s.add_dependency "chef-config", "= #{Chef::VERSION}"
diff --git a/lib/chef/resource/timezone.rb b/lib/chef/resource/timezone.rb
index 29c65b696c..5d4f1aca5e 100644
--- a/lib/chef/resource/timezone.rb
+++ b/lib/chef/resource/timezone.rb
@@ -24,7 +24,7 @@ class Chef
class Timezone < Chef::Resource
resource_name :timezone
- description "Use the timezone resource to change the system timezone on Linux and macOS hosts. Timezones are specified in tz database format, with a complete list of available TZ values here https://en.wikipedia.org/wiki/List_of_tz_database_time_zones."
+ description "Use the timezone resource to change the system timezone on Windows, Linux, and macOS hosts. Timezones are specified in tz database format, with a complete list of available TZ values for Linux and macOS here: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones and for Windows here: https://ss64.com/nt/timezones.html."
introduced "14.6"
property :timezone, String,
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e8d1fb21ea..019d3737ab 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.0.96")
+ VERSION = Chef::VersionString.new("15.0.101")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 3e3c2ee7f8..7945857987 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: ca035f744ece299cbdf81f52edb997b4ba1693b2
+ revision: 708e9c7413c83a6e19a40e212ad884c78a905a5d
branch: master
specs:
- omnibus (6.0.7)
+ omnibus (6.0.8)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -32,8 +32,8 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.1)
- aws-partitions (1.117.0)
- aws-sdk-core (3.40.0)
+ aws-partitions (1.121.0)
+ aws-sdk-core (3.42.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
@@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.13.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sigv4 (~> 1.0)
- aws-sdk-s3 (1.27.0)
+ aws-sdk-s3 (1.29.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
@@ -302,7 +302,7 @@ GEM
structured_warnings (0.3.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- test-kitchen (1.23.2)
+ test-kitchen (1.23.3)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 8664617310..d3ee80b78a 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -23,3 +23,11 @@ override "util-macros", version: "1.19.0"
override "xproto", version: "7.0.28"
override "zlib", version: "1.2.11"
override "openssl", version: "1.0.2q"
+
+# we build both a chef and ohai omnibus-software defintion which create the
+# chef-client and ohai binstubs. Out of the box the ohai definition uses whatever
+# is in master, which won't match what's in the Gemfile.lock and used by the chef
+# definition. This pin will ensure that ohai and chef-client commands use the
+# same (released) version of ohai.
+gemfile_lock = File.join(File.expand_path(File.dirname(__FILE__)), "Gemfile.lock")
+override "ohai", version: "#{::File.readlines(gemfile_lock).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1}" # rubocop: disable Layout/SpaceInsideStringInterpolation
View Lorry Controller Status