summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-24 04:32:41 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-24 04:32:41 +0000
commit7f751ef7acb1c99a3754840a6ecfc7650494e50c (patch)
tree489b0a93200823d58de506be09801966f8a59504
parent55f6e8c2602c55abf8b27051a4e578169afd8c0e (diff)
downloadchef-7f751ef7acb1c99a3754840a6ecfc7650494e50c.tar.gz
Bump version to 14.12.11 by Chef Expeditorv14.12.11
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 8d029952ca..8f673296f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.12.10 -->
-## [v14.12.10](https://github.com/chef/chef/tree/v14.12.10) (2019-05-17)
+<!-- latest_release 14.12.11 -->
+## [v14.12.11](https://github.com/chef/chef/tree/v14.12.11) (2019-05-24)
#### Merged Pull Requests
-- Add chef-14 update_version script [#8565](https://github.com/chef/chef/pull/8565) ([jaymalasinha](https://github.com/jaymalasinha))
+- Remove resource collision deprecations [#8511](https://github.com/chef/chef/pull/8511) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.12.9 -->
### Changes since 14.12.9 release
#### Merged Pull Requests
+- Remove resource collision deprecations [#8511](https://github.com/chef/chef/pull/8511) ([tas50](https://github.com/tas50)) <!-- 14.12.11 -->
- Add chef-14 update_version script [#8565](https://github.com/chef/chef/pull/8565) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 14.12.10 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ab52a326d7..0e4e4c5e94 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.12.10)
+ chef (14.12.11)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.10)
+ chef-config (= 14.12.11)
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.10-universal-mingw32)
+ chef (14.12.11-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.10)
+ chef-config (= 14.12.11)
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.10)
+ chef-config (14.12.11)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index d52ce1e127..0ddca30c2e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.12.10 \ No newline at end of file
+14.12.11 \ 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 2acd94a8e0..e212589395 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.10".freeze
+ VERSION = "14.12.11".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 881cdddd69..6e652345b3 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.10")
+ VERSION = Chef::VersionString.new("14.12.11")
end
#