summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-08-23 01:12:13 +0000
committerChef Expeditor <chef-ci@chef.io>2019-08-23 01:12:13 +0000
commit6fac5391c716d5b2dcbcb184aedda3f9e9a3042b (patch)
treea1f37ffdeee188787458c5f2aa5ddc800da6cd31
parent1403e97035b36acf8a6af88180a021fa1a196dfb (diff)
downloadchef-14.14.1.tar.gz
Bump version to 14.14.1 by Chef Expeditorv14.14.1
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 9f66bc74ea..d1197f8f50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.14.0 -->
-## [v14.14.0](https://github.com/chef/chef/tree/v14.14.0) (2019-08-22)
+<!-- latest_release 14.14.1 -->
+## [v14.14.1](https://github.com/chef/chef/tree/v14.14.1) (2019-08-23)
#### Merged Pull Requests
-- Update Chef 14 deps to the latest [#8824](https://github.com/chef/chef/pull/8824) ([tas50](https://github.com/tas50))
+- unified mode backport to Chef-14 [#8841](https://github.com/chef/chef/pull/8841) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=14.13.11 -->
### Changes since 14.13.11 release
#### Merged Pull Requests
+- unified mode backport to Chef-14 [#8841](https://github.com/chef/chef/pull/8841) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.14.1 -->
- Update Chef 14 deps to the latest [#8824](https://github.com/chef/chef/pull/8824) ([tas50](https://github.com/tas50)) <!-- 14.14.0 -->
- Add AIX 7.2 platform [#8833](https://github.com/chef/chef/pull/8833) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 14.13.16 -->
- Deprecate Ubuntu 14 + SLES 11 [#8818](https://github.com/chef/chef/pull/8818) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 14.13.15 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 046c113630..e8c497bae9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.0)
+ chef (14.14.1)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.0)
+ chef-config (= 14.14.1)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.14.0-universal-mingw32)
+ chef (14.14.1-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.0)
+ chef-config (= 14.14.1)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.14.0)
+ chef-config (14.14.1)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 6ea03e03f1..74a3b98991 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.0 \ No newline at end of file
+14.14.1 \ 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 428a349de6..8c1507eba7 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.14.0".freeze
+ VERSION = "14.14.1".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b269ad250f..84a344f9b0 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.14.0")
+ VERSION = Chef::VersionString.new("14.14.1")
end
#