summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-21 09:52:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-21 09:52:03 +0000
commit3ae989a40029813df47e4c70b6e71e919e908a20 (patch)
treefe057f6a07f7c4c6454172f44f03ecd8f3fdc702
parent24384f09a969bec823f2376d1a1fd7cea494efdb (diff)
downloadchef-13.7.25.tar.gz
Bump version to 13.7.25 by Expeditorv13.7.25
-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 3e87445fde..626ea0bdae 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.24 -->
-## [v13.7.24](https://github.com/chef/chef/tree/v13.7.24) (2018-02-15)
+<!-- latest_release 13.7.25 -->
+## [v13.7.25](https://github.com/chef/chef/tree/v13.7.25) (2018-02-21)
#### Merged Pull Requests
-- Fix windows_task idle_time validation [#6856](https://github.com/chef/chef/pull/6856) ([tas50](https://github.com/tas50))
+- Update libxml2 to 2.9.7 [#6886](https://github.com/chef/chef/pull/6886) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Update libxml2 to 2.9.7 [#6886](https://github.com/chef/chef/pull/6886) ([tas50](https://github.com/tas50)) <!-- 13.7.25 -->
- Fix windows_task idle_time validation [#6856](https://github.com/chef/chef/pull/6856) ([tas50](https://github.com/tas50)) <!-- 13.7.24 -->
- add Chef::NodeMap#delete_class API (Chef 13 backport) [#6848](https://github.com/chef/chef/pull/6848) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.7.23 -->
- RemoteFile: unlink tempfile when using cache control shows unchanged (Chef-13 backport) [#6849](https://github.com/chef/chef/pull/6849) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.7.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e8ddce06ea..d51517a7c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.7.24)
+ chef (13.7.25)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.24)
+ chef-config (= 13.7.25)
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.24-universal-mingw32)
+ chef (13.7.25-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.7.24)
+ chef-config (= 13.7.25)
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.24)
+ chef-config (13.7.25)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index e36d5d605c..fafd95b5eb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.24 \ No newline at end of file
+13.7.25 \ 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 f83d2e1ccb..3da985d67e 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.24"
+ VERSION = "13.7.25"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0459602912..555f7a440a 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.24")
+ VERSION = Chef::VersionString.new("13.7.25")
end
#