summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-27 09:12:56 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-27 09:12:56 +0000
commit99e539e7fec9d7c241bba5d9ab3ae18985eedc55 (patch)
tree7483097368f104aa85c0fd6f7c8a2a26d4a1aab1
parent0c6d82f543198f9316bc1d81cbd50a43c40052b0 (diff)
downloadchef-99e539e7fec9d7c241bba5d9ab3ae18985eedc55.tar.gz
Bump version to 13.4.36 by Chef Expeditorv13.4.36
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1741f90e79..53158f62f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.4.35 -->
-## [v13.4.35](https://github.com/chef/chef/tree/v13.4.35) (2017-09-26)
+<!-- latest_release 13.4.36 -->
+## [v13.4.36](https://github.com/chef/chef/tree/v13.4.36) (2017-09-27)
#### Merged Pull Requests
-- Only accept MM/DD/YYYY for windows_task start_day [#6434](https://github.com/chef/chef/pull/6434) ([jaym](https://github.com/jaym))
+- fix password property is sensitive for mount resource [#6442](https://github.com/chef/chef/pull/6442) ([dimsh99](https://github.com/dimsh99))
<!-- latest_release -->
<!-- release_rollup since=13.4.24 -->
### Changes since 13.4.24 release
#### Merged Pull Requests
+- fix password property is sensitive for mount resource [#6442](https://github.com/chef/chef/pull/6442) ([dimsh99](https://github.com/dimsh99)) <!-- 13.4.36 -->
- Only accept MM/DD/YYYY for windows_task start_day [#6434](https://github.com/chef/chef/pull/6434) ([jaym](https://github.com/jaym)) <!-- 13.4.35 -->
- Update dependencies to pull in InSpec v1.39.1 [#6440](https://github.com/chef/chef/pull/6440) ([adamleff](https://github.com/adamleff)) <!-- 13.4.34 -->
- update expeditor labels [#6432](https://github.com/chef/chef/pull/6432) ([thommay](https://github.com/thommay)) <!-- 13.4.33 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8bcec8e3ad..e407fa97f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.35)
+ chef (13.4.36)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.35)
+ chef-config (= 13.4.36)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.4.35-universal-mingw32)
+ chef (13.4.36-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.35)
+ chef-config (= 13.4.36)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.4.35)
+ chef-config (13.4.36)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -300,11 +300,11 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (2.0.0)
- serverspec (2.40.0)
+ serverspec (2.41.0)
multi_json
rspec (~> 3.0)
rspec-its
- specinfra (~> 2.68)
+ specinfra (~> 2.72)
sfl (2.3)
simplecov (0.15.1)
docile (~> 1.1.0)
diff --git a/VERSION b/VERSION
index 0a145ae51c..ae19466789 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.35 \ No newline at end of file
+13.4.36 \ 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 3e53f6a904..f40ea88c08 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 = "13.4.35"
+ VERSION = "13.4.36"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 12196d7acf..1704b653dd 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("13.4.35")
+ VERSION = Chef::VersionString.new("13.4.36")
end
#