summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-22 02:25:47 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-22 02:25:47 +0000
commitdeb846d8298c6041a1ffff3e91c4697e2a58211a (patch)
tree7fa57ce136b9d7585b92651b9d527bb841e89056
parentfd69b43d83360327800c46812de3d404847bc7db (diff)
downloadchef-deb846d8298c6041a1ffff3e91c4697e2a58211a.tar.gz
Bump version to 15.10.14 by Chef Expeditorv15.10.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 c4dbca0f67..a05bbf9386 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.10.13 -->
-## [v15.10.13](https://github.com/chef/chef/tree/v15.10.13) (2020-04-22)
+<!-- latest_release 15.10.14 -->
+## [v15.10.14](https://github.com/chef/chef/tree/v15.10.14) (2020-04-22)
#### Merged Pull Requests
-- Update omnibus-software to avoid appbundler adding extra gems [#9709](https://github.com/chef/chef/pull/9709) ([tas50](https://github.com/tas50))
+- Update Nokogiri to 1.10.9 [#9708](https://github.com/chef/chef/pull/9708) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.9.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update Nokogiri to 1.10.9 [#9708](https://github.com/chef/chef/pull/9708) ([tas50](https://github.com/tas50)) <!-- 15.10.14 -->
- Update omnibus-software to avoid appbundler adding extra gems [#9709](https://github.com/chef/chef/pull/9709) ([tas50](https://github.com/tas50)) <!-- 15.10.13 -->
- Update Ohai to 15.9 [#9707](https://github.com/chef/chef/pull/9707) ([tas50](https://github.com/tas50)) <!-- 15.10.12 -->
- Update omnibus-software to resolve shipping 2 copies of pry [#9701](https://github.com/chef/chef/pull/9701) ([tas50](https://github.com/tas50)) <!-- 15.10.11 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6319a248b9..f4ee26fe60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.10.13)
+ chef (15.10.14)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.10.13)
- chef-utils (= 15.10.13)
+ chef-config (= 15.10.14)
+ chef-utils (= 15.10.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.10.13-universal-mingw32)
+ chef (15.10.14-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.10.13)
- chef-utils (= 15.10.13)
+ chef-config (= 15.10.14)
+ chef-utils (= 15.10.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.10.13)
- chef (= 15.10.13)
+ chef-bin (15.10.14)
+ chef (= 15.10.14)
PATH
remote: chef-config
specs:
- chef-config (15.10.13)
+ chef-config (15.10.14)
addressable
- chef-utils (= 15.10.13)
+ chef-utils (= 15.10.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.10.13)
+ chef-utils (15.10.14)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 1fde59a12c..94746586aa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.10.13 \ No newline at end of file
+15.10.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 14089cca56..b35e2052ac 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.10.13".freeze
+ VERSION = "15.10.14".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 88800dc156..d6dd01c3de 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.10.13".freeze
+ VERSION = "15.10.14".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index b98b0542b2..5f9250479e 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.10.13".freeze
+ VERSION = "15.10.14".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8ee4db5e51..37d9a4c42a 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.10.13")
+ VERSION = Chef::VersionString.new("15.10.14")
end
#