summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/unit/provider/mount_spec.rb3
8 files changed, 22 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index efff003064..378bc49f94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.7.41 -->
-## [v16.7.41](https://github.com/chef/chef/tree/v16.7.41) (2020-11-12)
+<!-- latest_release 16.7.42 -->
+## [v16.7.42](https://github.com/chef/chef/tree/v16.7.42) (2020-11-13)
#### Merged Pull Requests
-- Update omnibus to remove the chef-sugar dep [#10629](https://github.com/chef/chef/pull/10629) ([tas50](https://github.com/tas50))
+- mount: changes to fix solaris test failure [#10643](https://github.com/chef/chef/pull/10643) ([antima-gupta](https://github.com/antima-gupta))
<!-- latest_release -->
<!-- release_rollup since=16.6.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- mount: changes to fix solaris test failure [#10643](https://github.com/chef/chef/pull/10643) ([antima-gupta](https://github.com/antima-gupta)) <!-- 16.7.42 -->
- Update omnibus to remove the chef-sugar dep [#10629](https://github.com/chef/chef/pull/10629) ([tas50](https://github.com/tas50)) <!-- 16.7.41 -->
- knife bootstrap deps require net/ssh [#10638](https://github.com/chef/chef/pull/10638) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 16.7.40 -->
- Change how zypper_package calculates the candidate_version [#10631](https://github.com/chef/chef/pull/10631) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.7.39 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f3b360febd..1bef48ca23 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.7.41)
+ chef (16.7.42)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.7.41)
- chef-utils (= 16.7.41)
+ chef-config (= 16.7.42)
+ chef-utils (= 16.7.42)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -64,12 +64,12 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.7.41-universal-mingw32)
+ chef (16.7.42-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.7.41)
- chef-utils (= 16.7.41)
+ chef-config (= 16.7.42)
+ chef-utils (= 16.7.42)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -115,15 +115,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.7.41)
- chef (= 16.7.41)
+ chef-bin (16.7.42)
+ chef (= 16.7.42)
PATH
remote: chef-config
specs:
- chef-config (16.7.41)
+ chef-config (16.7.42)
addressable
- chef-utils (= 16.7.41)
+ chef-utils (= 16.7.42)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -132,7 +132,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.7.41)
+ chef-utils (16.7.42)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 845c7b912f..4a495c6ea7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.41 \ No newline at end of file
+16.7.42 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 996939f53d..e47d49e687 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.7.41".freeze
+ VERSION = "16.7.42".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index cdf125614a..524d5c7d7e 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.7.41".freeze
+ VERSION = "16.7.42".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index e163aff114..09b5aca4f8 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.7.41"
+ VERSION = "16.7.42"
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 986f54e05e..8e5509329b 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("..", __dir__)
- VERSION = Chef::VersionString.new("16.7.41")
+ VERSION = Chef::VersionString.new("16.7.42")
end
#
diff --git a/spec/unit/provider/mount_spec.rb b/spec/unit/provider/mount_spec.rb
index 47bab39e66..7800d0c666 100644
--- a/spec/unit/provider/mount_spec.rb
+++ b/spec/unit/provider/mount_spec.rb
@@ -207,7 +207,8 @@ describe Chef::Provider::Mount do
expect { provider.disable_fs }.to raise_error(Chef::Exceptions::UnsupportedAction)
end
- describe "#device_unchanged?" do
+ # Not supported on solaris because it can't cope with a LABEL device type.
+ describe "#device_unchanged?", :not_supported_on_solaris do
it "should be true when device_type not changed" do
expect(provider.device_unchanged?).to be_truthy
end
View Lorry Controller Status