summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-15 18:33:34 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-15 18:33:34 +0000
commit095a03b01ff3527bdbbc49d1d71db8b6806f3dc2 (patch)
tree771a9504e8a07149eb70392118788716f6e957dd
parent3c908d2c55e24313389139d4dd07ccddf5df2d32 (diff)
downloadchef-095a03b01ff3527bdbbc49d1d71db8b6806f3dc2.tar.gz
Bump version to 13.4.25 by Chef Expeditorv13.4.25
-rw-r--r--CHANGELOG.md9
-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, 14 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d5dbdcf59..e024585afd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.4.23 -->
-## [v13.4.23](https://github.com/chef/chef/tree/v13.4.23) (2017-09-14)
+<!-- latest_release 13.4.25 -->
+## [v13.4.25](https://github.com/chef/chef/tree/v13.4.25) (2017-09-15)
#### Merged Pull Requests
-- Use ruby 2.4.2 to addess multiple security vulnerabilities [#6404](https://github.com/chef/chef/pull/6404) ([thommay](https://github.com/thommay))
+- Replace which apt-get check with simple debian check in apt resources [#6409](https://github.com/chef/chef/pull/6409) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.4.24 -->
### Changes since 13.4.24 release
+
+#### Merged Pull Requests
+- Replace which apt-get check with simple debian check in apt resources [#6409](https://github.com/chef/chef/pull/6409) ([tas50](https://github.com/tas50)) <!-- 13.4.25 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index dfefe25613..f3b1c2faf4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.24)
+ chef (13.4.25)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.24)
+ chef-config (= 13.4.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.4.24-universal-mingw32)
+ chef (13.4.25-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.24)
+ chef-config (= 13.4.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.4.24)
+ chef-config (13.4.25)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 8d5d901a60..ab6c36b749 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.24 \ No newline at end of file
+13.4.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 827a05df40..7ee99265d3 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.4.24"
+ VERSION = "13.4.25"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e70e5e078e..a22f990cf8 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.4.24")
+ VERSION = Chef::VersionString.new("13.4.25")
end
#