summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-18 14:21:19 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-18 14:21:19 +0000
commitacbd6d8371586ab86e1c5595520e18c15631d79d (patch)
treeb3241ec60d4f991292f00abbbce5abc48728aba7
parent842751b994a432e7d1f17db980197649fa797e2b (diff)
downloadchef-acbd6d8371586ab86e1c5595520e18c15631d79d.tar.gz
Bump version to 14.5.25 by Chef Expeditorv14.5.25
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 9ee590b6a3..5d6d122c13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.5.24 -->
-## [v14.5.24](https://github.com/chef/chef/tree/v14.5.24) (2018-09-18)
+<!-- latest_release 14.5.25 -->
+## [v14.5.25](https://github.com/chef/chef/tree/v14.5.25) (2018-09-18)
#### Merged Pull Requests
-- Pull in updated omnibus-software [#7658](https://github.com/chef/chef/pull/7658) ([tas50](https://github.com/tas50))
+- Update script resource deprecation waring [#7651](https://github.com/chef/chef/pull/7651) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- Update script resource deprecation waring [#7651](https://github.com/chef/chef/pull/7651) ([tas50](https://github.com/tas50)) <!-- 14.5.25 -->
- Pull in updated omnibus-software [#7658](https://github.com/chef/chef/pull/7658) ([tas50](https://github.com/tas50)) <!-- 14.5.24 -->
- Add Chef 14.5 release notes [#7652](https://github.com/chef/chef/pull/7652) ([tas50](https://github.com/tas50)) <!-- 14.5.23 -->
- Bump InSpec and Ohai to the latest [#7657](https://github.com/chef/chef/pull/7657) ([tas50](https://github.com/tas50)) <!-- 14.5.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f23e3670e6..98998567cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.24)
+ chef (14.5.25)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.24)
+ chef-config (= 14.5.25)
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.5.24-universal-mingw32)
+ chef (14.5.25-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.24)
+ chef-config (= 14.5.25)
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.5.24)
+ chef-config (14.5.25)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 89f3f8f800..13bdb30e5e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.24 \ No newline at end of file
+14.5.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 25827af0a3..8bd98b59f1 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.5.24".freeze
+ VERSION = "14.5.25".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c045f59caf..0408286b01 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.5.24")
+ VERSION = Chef::VersionString.new("14.5.25")
end
#