summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-15 10:19:13 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-15 10:19:13 +0000
commitd44d54c7baed8d37717a8baf44b0cc50ccb9d910 (patch)
tree5a472ee38df7f0451efd9f337d03a203eb46d6a6
parent3f9cc3cf3fbee8384320bf8cf157b23d17b2ab3a (diff)
downloadchef-d44d54c7baed8d37717a8baf44b0cc50ccb9d910.tar.gz
Bump version to 14.6.26 by Chef Expeditorv14.6.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 b80bb2b8c7..07241446b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.25 -->
-## [v14.6.25](https://github.com/chef/chef/tree/v14.6.25) (2018-10-13)
+<!-- latest_release 14.6.26 -->
+## [v14.6.26](https://github.com/chef/chef/tree/v14.6.26) (2018-10-15)
#### Merged Pull Requests
-- Bump inspec-core to 2.3.24 [#7748](https://github.com/chef/chef/pull/7748) ([chef-ci](https://github.com/chef-ci))
+- Update omnibus deps [#7749](https://github.com/chef/chef/pull/7749) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Update omnibus deps [#7749](https://github.com/chef/chef/pull/7749) ([tas50](https://github.com/tas50)) <!-- 14.6.26 -->
- Bump inspec-core to 2.3.24 [#7748](https://github.com/chef/chef/pull/7748) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.25 -->
- Bump inspec-core to 2.3.23 [#7747](https://github.com/chef/chef/pull/7747) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.24 -->
- When a property regex fails don&#39;t call it an option [#7745](https://github.com/chef/chef/pull/7745) ([tas50](https://github.com/tas50)) <!-- 14.6.23 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0124576240..c4b542bea0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.25)
+ chef (14.6.26)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.25)
+ chef-config (= 14.6.26)
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.6.25-universal-mingw32)
+ chef (14.6.26-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.25)
+ chef-config (= 14.6.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.6.25)
+ chef-config (14.6.26)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index bb9990cd66..96e7b7ec99 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.25 \ No newline at end of file
+14.6.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 3e60bbf515..071aa446d6 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.6.25".freeze
+ VERSION = "14.6.26".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 886904b86a..83554ca770 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.6.25")
+ VERSION = Chef::VersionString.new("14.6.26")
end
#