summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md8
-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/resource/windows_share.rb8
-rw-r--r--lib/chef/version.rb2
8 files changed, 22 insertions, 26 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cecd1a9c39..a7fa7e8219 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.0.247 -->
-## [v16.0.247](https://github.com/chef/chef/tree/v16.0.247) (2020-04-25)
+<!-- latest_release 16.0.248 -->
+## [v16.0.248](https://github.com/chef/chef/tree/v16.0.248) (2020-04-27)
#### Merged Pull Requests
-- Test and better document the locale resource [#9736](https://github.com/chef/chef/pull/9736) ([tas50](https://github.com/tas50))
-- Run Test Kitchen tests on Ruby 2.7 [#9737](https://github.com/chef/chef/pull/9737) ([tas50](https://github.com/tas50))
+- Remove the Windows version check in windows_share [#9741](https://github.com/chef/chef/pull/9741) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.6.10 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Remove the Windows version check in windows_share [#9741](https://github.com/chef/chef/pull/9741) ([tas50](https://github.com/tas50)) <!-- 16.0.248 -->
- Test and better document the locale resource [#9736](https://github.com/chef/chef/pull/9736) ([tas50](https://github.com/tas50)) <!-- 16.0.247 -->
- Run Test Kitchen tests on Ruby 2.7 [#9737](https://github.com/chef/chef/pull/9737) ([tas50](https://github.com/tas50)) <!-- 16.0.246 -->
- Update Ohai to 16.0.20 [#9734](https://github.com/chef/chef/pull/9734) ([tas50](https://github.com/tas50)) <!-- 16.0.246 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0023f936b8..10513934f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (16.0.247)
+ chef (16.0.248)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 16.0.247)
- chef-utils (= 16.0.247)
+ chef-config (= 16.0.248)
+ chef-utils (= 16.0.248)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -61,12 +61,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.0.247-universal-mingw32)
+ chef (16.0.248-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 16.0.247)
- chef-utils (= 16.0.247)
+ chef-config (= 16.0.248)
+ chef-utils (= 16.0.248)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -111,15 +111,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.0.247)
- chef (= 16.0.247)
+ chef-bin (16.0.248)
+ chef (= 16.0.248)
PATH
remote: chef-config
specs:
- chef-config (16.0.247)
+ chef-config (16.0.248)
addressable
- chef-utils (= 16.0.247)
+ chef-utils (= 16.0.248)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -128,7 +128,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.0.247)
+ chef-utils (16.0.248)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 979aae3649..f6e124c613 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.247 \ No newline at end of file
+16.0.248 \ 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 e2dc4ad592..7596ea89af 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("../..", __FILE__)
- VERSION = "16.0.247".freeze
+ VERSION = "16.0.248".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 9a9ffe350b..e21760f1ea 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("../..", __FILE__)
- VERSION = "16.0.247".freeze
+ VERSION = "16.0.248".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 6eb42dbb2a..aa33105596 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.0.247".freeze
+ VERSION = "16.0.248".freeze
end
diff --git a/lib/chef/resource/windows_share.rb b/lib/chef/resource/windows_share.rb
index c2689fe26d..6c29a6443d 100644
--- a/lib/chef/resource/windows_share.rb
+++ b/lib/chef/resource/windows_share.rb
@@ -145,12 +145,8 @@ class Chef
read_users r_users
end
- def after_created
- raise "The windows_share resource relies on PowerShell cmdlets not present in Windows releases prior to 8/2012. Cannot continue!" if node["platform_version"].to_f < 6.3
- end
-
-# given the string output of Get-SmbShareAccess parse out
-# arrays of full access users, change users, and read only users
+ # given the string output of Get-SmbShareAccess parse out
+ # arrays of full access users, change users, and read only users
def parse_permissions(results_string)
json_results = Chef::JSONCompat.from_json(results_string)
json_results = [json_results] unless json_results.is_a?(Array) # single result is not an array
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4fb2235857..9c79d22777 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("../..", __FILE__)
- VERSION = Chef::VersionString.new("16.0.247")
+ VERSION = Chef::VersionString.new("16.0.248")
end
#
View Lorry Controller Status