summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-31 21:16:17 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-31 21:16:17 +0000
commit6db2c9a021d46083aa854191b6e434fe81ced734 (patch)
tree5fcd63baa915b259b4352db8c3753560fe9e19b4
parent72840d11042660e84e3118d1ae5e4643c6336e58 (diff)
downloadchef-6db2c9a021d46083aa854191b6e434fe81ced734.tar.gz
Bump version to 14.7.4 by Chef Expeditorv14.7.4
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-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, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77dfaa987c..c6272cb42d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.7.3 -->
-## [v14.7.3](https://github.com/chef/chef/tree/v14.7.3) (2018-10-31)
+<!-- latest_release 14.7.4 -->
+## [v14.7.4](https://github.com/chef/chef/tree/v14.7.4) (2018-10-31)
#### Merged Pull Requests
-- Backport: Fix SLES 15 upgrades removing the symlinks [#7827](https://github.com/chef/chef/pull/7827) ([tas50](https://github.com/tas50))
+- Backport: Add windows_share and windows_certificate resources [#7833](https://github.com/chef/chef/pull/7833) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.6.47 -->
### Changes since 14.6.47 release
#### Merged Pull Requests
+- Backport: Add windows_share and windows_certificate resources [#7833](https://github.com/chef/chef/pull/7833) ([tas50](https://github.com/tas50)) <!-- 14.7.4 -->
- Backport: Fix SLES 15 upgrades removing the symlinks [#7827](https://github.com/chef/chef/pull/7827) ([tas50](https://github.com/tas50)) <!-- 14.7.3 -->
- Backport: Fix inspector to properly handle defaults that are symbols [#7826](https://github.com/chef/chef/pull/7826) ([tas50](https://github.com/tas50)) <!-- 14.7.2 -->
- Backport: Add macOS support to the timezone resource [#7830](https://github.com/chef/chef/pull/7830) ([tas50](https://github.com/tas50)) <!-- 14.7.1 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a768efaa76..252b733468 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.7.3)
+ chef (14.7.4)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.3)
+ chef-config (= 14.7.4)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.7.3-universal-mingw32)
+ chef (14.7.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.3)
+ chef-config (= 14.7.4)
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.7.3)
+ chef-config (14.7.4)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 1f4bff5c62..45bfbe72f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.3 \ No newline at end of file
+14.7.4 \ 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 f01a275a7d..ae361182f1 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.7.3".freeze
+ VERSION = "14.7.4".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d2b0bac8a7..032bdfa0b8 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.7.3")
+ VERSION = Chef::VersionString.new("14.7.4")
end
#