summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-03 17:32:24 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-03 17:32:24 +0000
commitc6433605bae0a9f52c843ca8cb97e64b2bcf5f0a (patch)
treed6450e28cdfc634ada5820a3698172b2f1e28152
parent7bdb7a24519840b08b1086c68f3c5eed84f9a3e2 (diff)
downloadchef-c6433605bae0a9f52c843ca8cb97e64b2bcf5f0a.tar.gz
Bump version to 13.7.4 by Expeditorv13.7.4
-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 4df8b5f34d..3d94f502b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.7.3 -->
-## [v13.7.3](https://github.com/chef/chef/tree/v13.7.3) (2018-01-03)
+<!-- latest_release 13.7.4 -->
+## [v13.7.4](https://github.com/chef/chef/tree/v13.7.4) (2018-01-03)
#### Merged Pull Requests
-- Don&#39;t check both platform_family / os in provides when platform_family will do [#6711](https://github.com/chef/chef/pull/6711) ([tas50](https://github.com/tas50))
+- Modernize windows_path resource [#6699](https://github.com/chef/chef/pull/6699) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Modernize windows_path resource [#6699](https://github.com/chef/chef/pull/6699) ([tas50](https://github.com/tas50)) <!-- 13.7.4 -->
- Don&#39;t check both platform_family / os in provides when platform_family will do [#6711](https://github.com/chef/chef/pull/6711) ([tas50](https://github.com/tas50)) <!-- 13.7.3 -->
- Update the knife editor error message to point to the correct document [#6726](https://github.com/chef/chef/pull/6726) ([tas50](https://github.com/tas50)) <!-- 13.7.2 -->
- Remove a useless regex in zypper_repository resource [#6710](https://github.com/chef/chef/pull/6710) ([tas50](https://github.com/tas50)) <!-- 13.7.1 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a6e1d2f46..4211fd0eda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.7.3)
+ chef (13.7.4)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.3)
+ chef-config (= 13.7.4)
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.7.3-universal-mingw32)
+ chef (13.7.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.3)
+ chef-config (= 13.7.4)
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.7.3)
+ chef-config (13.7.4)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index e32d1dd484..1fabcd61c9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.3 \ No newline at end of file
+13.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 7f1c2e39ea..28dbcb34f2 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.7.3"
+ VERSION = "13.7.4"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 759b647376..b2781c7367 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.7.3")
+ VERSION = Chef::VersionString.new("13.7.4")
end
#