summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-12-13 20:35:37 +0000
committerChef Expeditor <expeditor@chef.io>2019-12-13 20:35:37 +0000
commitcc81bcf6ae32f10eaef6bf15a02326744e21e078 (patch)
tree760dbd5a5ada0cda62c3fc80cf2934c3c4f7ae54
parent03fa4520d98db7153fa07ce417ee75e166edc68c (diff)
downloadchef-cc81bcf6ae32f10eaef6bf15a02326744e21e078.tar.gz
Bump version to 15.6.14 by Chef Expeditorv15.6.14
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f44b718bc6..73e7b2a9e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.6.12 -->
-## [v15.6.12](https://github.com/chef/chef/tree/v15.6.12) (2019-12-12)
+<!-- latest_release 15.6.14 -->
+## [v15.6.14](https://github.com/chef/chef/tree/v15.6.14) (2019-12-13)
#### Merged Pull Requests
-- Bump train-core to 3.2.5 [#9159](https://github.com/chef/chef/pull/9159) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
+- try unit + functional tests [#9163](https://github.com/chef/chef/pull/9163) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=15.6.10 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- try unit + functional tests [#9163](https://github.com/chef/chef/pull/9163) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.6.14 -->
- Bump train-core to 3.2.5 [#9159](https://github.com/chef/chef/pull/9159) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 15.6.12 -->
- Fix mac_user breakage and logging [#9158](https://github.com/chef/chef/pull/9158) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.6.11 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 61eda4baa4..44b6fefabb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.6.13)
+ chef (15.6.14)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.6.13)
- chef-utils (= 15.6.13)
+ chef-config (= 15.6.14)
+ chef-utils (= 15.6.14)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.6.13-universal-mingw32)
+ chef (15.6.14-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.6.13)
- chef-utils (= 15.6.13)
+ chef-config (= 15.6.14)
+ chef-utils (= 15.6.14)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.6.13)
- chef (= 15.6.13)
+ chef-bin (15.6.14)
+ chef (= 15.6.14)
PATH
remote: chef-config
specs:
- chef-config (15.6.13)
+ chef-config (15.6.14)
addressable
- chef-utils (= 15.6.13)
+ chef-utils (= 15.6.14)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.6.13)
+ chef-utils (15.6.14)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index c1314074bb..edffcb36d3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.6.13 \ No newline at end of file
+15.6.14 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 89ef39e237..80404f748d 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.6.13".freeze
+ VERSION = "15.6.14".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 4657f59b40..d71ef2faff 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.6.13".freeze
+ VERSION = "15.6.14".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 308d9ac15c..969c1dbb78 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.6.13".freeze
+ VERSION = "15.6.14".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4f99673711..9674919c1f 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.6.13")
+ VERSION = Chef::VersionString.new("15.6.14")
end
#