summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md8
-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/provider/package/windows.rb1
-rw-r--r--lib/chef/provider/package/windows/exe.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock16
9 files changed, 27 insertions, 24 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f814e1138..db3cee58df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,17 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.32 -->
-## [v14.4.32](https://github.com/chef/chef/tree/v14.4.32) (2018-08-13)
+<!-- latest_release 14.4.34 -->
+## [v14.4.34](https://github.com/chef/chef/tree/v14.4.34) (2018-08-13)
#### Merged Pull Requests
-- Fix issue of setting comment for windows user [#7537](https://github.com/chef/chef/pull/7537) ([NAshwini](https://github.com/NAshwini))
+- windows_package: Fix package sensitive error [#7353](https://github.com/chef/chef/pull/7353) ([dheerajd-msys](https://github.com/dheerajd-msys))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- windows_package: Fix package sensitive error [#7353](https://github.com/chef/chef/pull/7353) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 14.4.34 -->
+- Require mixlib-shellout 2.4 or later [#7543](https://github.com/chef/chef/pull/7543) ([tas50](https://github.com/tas50)) <!-- 14.4.33 -->
- Fix issue of setting comment for windows user [#7537](https://github.com/chef/chef/pull/7537) ([NAshwini](https://github.com/NAshwini)) <!-- 14.4.32 -->
- Run rspec tests within a kitchen container on CentOS 7 [#7529](https://github.com/chef/chef/pull/7529) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.4.31 -->
- osx_profile: Use the full path to /usr/bin/profiles [#7539](https://github.com/chef/chef/pull/7539) ([tas50](https://github.com/tas50)) <!-- 14.4.30 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9317ba2051..2f5ea7d70c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.32)
+ chef (14.4.34)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.32)
+ chef-config (= 14.4.34)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -25,7 +25,7 @@ PATH
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
mixlib-log (~> 2.0, >= 2.0.3)
- mixlib-shellout (~> 2.0)
+ mixlib-shellout (~> 2.4)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (~> 4.2)
net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.4.32-universal-mingw32)
+ chef (14.4.34-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.32)
+ chef-config (= 14.4.34)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -56,7 +56,7 @@ PATH
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
mixlib-log (~> 2.0, >= 2.0.3)
- mixlib-shellout (~> 2.0)
+ mixlib-shellout (~> 2.4)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (~> 4.2)
net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.4.32)
+ chef-config (14.4.34)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -345,7 +345,7 @@ GEM
windows-api (0.4.4)
win32-api (>= 1.4.5)
wmi-lite (1.0.0)
- yard (0.9.15)
+ yard (0.9.16)
PLATFORMS
ruby
diff --git a/VERSION b/VERSION
index baa0f31ac1..6f28cf696d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.32 \ No newline at end of file
+14.4.34 \ 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 9ea077bf0b..3cd87681f8 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 = "14.4.32".freeze
+ VERSION = "14.4.34".freeze
end
#
diff --git a/chef.gemspec b/chef.gemspec
index b98f4c832a..6cbbe4b7fc 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.add_dependency "mixlib-cli", "~> 1.7"
s.add_dependency "mixlib-log", "~> 2.0", ">= 2.0.3"
s.add_dependency "mixlib-authentication", "~> 2.1"
- s.add_dependency "mixlib-shellout", "~> 2.0"
+ s.add_dependency "mixlib-shellout", "~> 2.4"
s.add_dependency "mixlib-archive", "~> 0.4"
s.add_dependency "ohai", "~> 14.0"
diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb
index d203adafe2..f011ebf909 100644
--- a/lib/chef/provider/package/windows.rb
+++ b/lib/chef/provider/package/windows.rb
@@ -229,6 +229,7 @@ class Chef
r.timeout(new_resource.timeout)
r.returns(new_resource.returns)
r.options(new_resource.options)
+ r.sensitive(new_resource.sensitive)
end
end
diff --git a/lib/chef/provider/package/windows/exe.rb b/lib/chef/provider/package/windows/exe.rb
index 6499d0cfeb..e43cd02b08 100644
--- a/lib/chef/provider/package/windows/exe.rb
+++ b/lib/chef/provider/package/windows/exe.rb
@@ -64,7 +64,7 @@ class Chef
unattended_flags,
expand_options(new_resource.options),
"& exit %%%%ERRORLEVEL%%%%",
- ].join(" "), timeout: new_resource.timeout, returns: new_resource.returns
+ ].join(" "), timeout: new_resource.timeout, returns: new_resource.returns, sensitive: new_resource.sensitive
)
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6176e48def..574412ec3b 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("14.4.32")
+ VERSION = Chef::VersionString.new("14.4.34")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bfe7f8da17..2f4e87fcec 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 6c242471a79698e5fc7b8d8364dedea3c246ef4a
+ revision: 386cd17f6a6365bd4585761a2738b4561fbaea97
branch: master
specs:
- omnibus (5.6.15)
+ omnibus (6.0.1)
aws-sdk (~> 2)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -31,13 +31,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.11.105)
- aws-sdk-resources (= 2.11.105)
- aws-sdk-core (2.11.105)
+ aws-sdk (2.11.106)
+ aws-sdk-resources (= 2.11.106)
+ aws-sdk-core (2.11.106)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.105)
- aws-sdk-core (= 2.11.105)
+ aws-sdk-resources (2.11.106)
+ aws-sdk-core (= 2.11.106)
aws-sigv4 (1.0.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -114,7 +114,7 @@ GEM
kitchen-vagrant (1.3.2)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
- license_scout (1.0.13)
+ license_scout (1.0.15)
ffi-yajl (~> 2.2)
mixlib-shellout (~> 2.2)
toml-rb (~> 1.0)
View Lorry Controller Status