summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-17 18:59:04 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-17 18:59:04 +0000
commit51deebd1b78520c0d4113c0da37b7a19697c19b7 (patch)
tree6649538ada5e12e7a75b611d8c3de18565ce5381
parent77a8474fcf502a613ca1eccd2b6488c7a28cecfa (diff)
downloadchef-51deebd1b78520c0d4113c0da37b7a19697c19b7.tar.gz
Bump version to 14.12.10 by Chef Expeditorv14.12.10
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-rw-r--r--Gemfile.lock18
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 22 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1073cf3244..8d029952ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 14.12.10 -->
+## [v14.12.10](https://github.com/chef/chef/tree/v14.12.10) (2019-05-17)
+
+#### Merged Pull Requests
+- Add chef-14 update_version script [#8565](https://github.com/chef/chef/pull/8565) ([jaymalasinha](https://github.com/jaymalasinha))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=14.12.9 -->
+### Changes since 14.12.9 release
+
+#### Merged Pull Requests
+- Add chef-14 update_version script [#8565](https://github.com/chef/chef/pull/8565) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 14.12.10 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9a8dee1e87..ab52a326d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.12.9)
+ chef (14.12.10)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.9)
+ chef-config (= 14.12.10)
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.12.9-universal-mingw32)
+ chef (14.12.10-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.9)
+ chef-config (= 14.12.10)
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.12.9)
+ chef-config (14.12.10)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -169,7 +169,7 @@ GEM
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (2.0.3)
- mixlib-config (2.2.18)
+ mixlib-config (3.0.1)
tomlrb
mixlib-log (3.0.1)
mixlib-shellout (2.4.4)
@@ -193,7 +193,7 @@ GEM
netrc (0.11.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.8.11)
+ ohai (14.8.12)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -267,7 +267,7 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (3.0.0)
- serverspec (2.41.3)
+ serverspec (2.41.4)
multi_json
rspec (~> 3.0)
rspec-its
@@ -279,7 +279,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.77.0)
+ specinfra (2.77.2)
net-scp
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
diff --git a/VERSION b/VERSION
index e65262d5ee..d52ce1e127 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.12.9 \ No newline at end of file
+14.12.10 \ 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 4536d47f46..2acd94a8e0 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.12.9".freeze
+ VERSION = "14.12.10".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f0e33efdbd..881cdddd69 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.12.9")
+ VERSION = Chef::VersionString.new("14.12.10")
end
#