summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-16 02:24:56 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-16 02:24:56 +0000
commit5c61b609899559962ce863b500bfde5228ff2b1c (patch)
treed178942435e614bc7432e9aa8919fbc373088306
parent7ce839f0a4ad6bc05f066c2ab2f16cf6343d40aa (diff)
downloadchef-5c61b609899559962ce863b500bfde5228ff2b1c.tar.gz
Bump version to 14.7.26 by Chef Expeditorv14.7.26
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 b580797839..f5c0bc182f 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.25 -->
-## [v14.7.25](https://github.com/chef/chef/tree/v14.7.25) (2018-11-14)
+<!-- latest_release 14.7.26 -->
+## [v14.7.26](https://github.com/chef/chef/tree/v14.7.26) (2018-11-16)
#### Merged Pull Requests
-- Update cheffish to 14.0.4 [#7937](https://github.com/chef/chef/pull/7937) ([tas50](https://github.com/tas50))
+- Bump inspec-core to 3.0.52 [#7945](https://github.com/chef/chef/pull/7945) ([chef-ci](https://github.com/chef-ci))
<!-- latest_release -->
<!-- release_rollup since=14.7.17 -->
### Changes since 14.7.17 release
#### Merged Pull Requests
+- Bump inspec-core to 3.0.52 [#7945](https://github.com/chef/chef/pull/7945) ([chef-ci](https://github.com/chef-ci)) <!-- 14.7.26 -->
- Update cheffish to 14.0.4 [#7937](https://github.com/chef/chef/pull/7937) ([tas50](https://github.com/tas50)) <!-- 14.7.25 -->
- Replace usage of win_friendly_path helper in windows_certificate [#7932](https://github.com/chef/chef/pull/7932) ([tas50](https://github.com/tas50)) <!-- 14.7.24 -->
- Bump InSpec to 3.0.46 [#7931](https://github.com/chef/chef/pull/7931) ([tas50](https://github.com/tas50)) <!-- 14.7.23 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 117919646d..21f1ce1315 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.7.25)
+ chef (14.7.26)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.25)
+ chef-config (= 14.7.26)
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.25-universal-mingw32)
+ chef (14.7.26-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.25)
+ chef-config (= 14.7.26)
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.25)
+ chef-config (14.7.26)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 7178cbdd1e..37cb18591c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.25 \ No newline at end of file
+14.7.26 \ 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 2cd988081a..2d444ff557 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.25".freeze
+ VERSION = "14.7.26".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0c5a93e52d..d0d3b1071a 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.25")
+ VERSION = Chef::VersionString.new("14.7.26")
end
#