summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-11 21:43:06 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-11 21:43:06 +0000
commit799e6e2e7c6534d2ec063080ee42268b75bc9f5f (patch)
tree09db7260087a0a745ea78e5b38ecc61b63a25743
parentd650a27edfe19352018b9651aebfca2fb9c035aa (diff)
downloadchef-799e6e2e7c6534d2ec063080ee42268b75bc9f5f.tar.gz
Bump version to 14.3.6 by Chef Expeditorv14.3.6
-rw-r--r--CHANGELOG.md8
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index be35722dab..2221b43468 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.3.5 -->
-## [v14.3.5](https://github.com/chef/chef/tree/v14.3.5) (2018-06-11)
+<!-- latest_release 14.3.6 -->
+## [v14.3.6](https://github.com/chef/chef/tree/v14.3.6) (2018-06-11)
#### Merged Pull Requests
-- Add ssh_known_hosts_entry resource from ssh_known_hosts cookbook [#7161](https://github.com/chef/chef/pull/7161) ([tas50](https://github.com/tas50))
-- Update help link in Add/Remove Programs on Windows [#7345](https://github.com/chef/chef/pull/7345) ([stuartpreston](https://github.com/stuartpreston))
+- Add kernel_module resource from the kernel_module cookbook [#7165](https://github.com/chef/chef/pull/7165) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.2.0 -->
### Changes since 14.2.0 release
#### Merged Pull Requests
+- Add kernel_module resource from the kernel_module cookbook [#7165](https://github.com/chef/chef/pull/7165) ([tas50](https://github.com/tas50)) <!-- 14.3.6 -->
- Add ssh_known_hosts_entry resource from ssh_known_hosts cookbook [#7161](https://github.com/chef/chef/pull/7161) ([tas50](https://github.com/tas50)) <!-- 14.3.5 -->
- Update help link in Add/Remove Programs on Windows [#7345](https://github.com/chef/chef/pull/7345) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.3.4 -->
- Implement rfc107: NodeMap locking for resource and provider handlers [#7224](https://github.com/chef/chef/pull/7224) ([coderanger](https://github.com/coderanger)) <!-- 14.3.4 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 21492d5cd7..de9ce3d23c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.3.5)
+ chef (14.3.6)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.5)
+ chef-config (= 14.3.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.3.5-universal-mingw32)
+ chef (14.3.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.5)
+ chef-config (= 14.3.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.3.5)
+ chef-config (14.3.6)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index ecbddd87b7..3f4ccddaab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.5 \ No newline at end of file
+14.3.6 \ 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 e92d4a5d8f..8c488e6a5b 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.3.5"
+ VERSION = "14.3.6"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e06a6d0824..6e62f4a52b 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.3.5")
+ VERSION = Chef::VersionString.new("14.3.6")
end
#