summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-03 19:19:01 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-03 19:19:01 +0000
commitdea42892cf2cb2123b4214151eb9e890153c122f (patch)
treeceb3c22405e2f95e628e609926e5ddc2e6a47e2f
parentec8a393be16bf5405bbb964f7874c055b44c25a4 (diff)
downloadchef-dea42892cf2cb2123b4214151eb9e890153c122f.tar.gz
Bump version to 14.12.0 by Chef Expeditorv14.12.0
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 45fd6f2d01..24a99df3ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.11.25 -->
-## [v14.11.25](https://github.com/chef/chef/tree/v14.11.25) (2019-03-20)
+<!-- latest_release 14.12.0 -->
+## [v14.12.0](https://github.com/chef/chef/tree/v14.12.0) (2019-04-03)
#### Merged Pull Requests
-- Remove travis gem dep and bump versions of multiple components [#8315](https://github.com/chef/chef/pull/8315) ([tas50](https://github.com/tas50))
+- Remove windows-api pin and update InSpec to 3.9.0 [#8327](https://github.com/chef/chef/pull/8327) ([jaymalasinha](https://github.com/jaymalasinha))
<!-- latest_release -->
<!-- release_rollup since=14.11.21 -->
### Changes since 14.11.21 release
#### Merged Pull Requests
+- Remove windows-api pin and update InSpec to 3.9.0 [#8327](https://github.com/chef/chef/pull/8327) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 14.12.0 -->
- Remove travis gem dep and bump versions of multiple components [#8315](https://github.com/chef/chef/pull/8315) ([tas50](https://github.com/tas50)) <!-- 14.11.25 -->
- Loosen the win32-cerstore and win32-service dependencies [#8295](https://github.com/chef/chef/pull/8295) ([tas50](https://github.com/tas50)) <!-- 14.11.24 -->
- Backport fix for #8080 [#8303](https://github.com/chef/chef/pull/8303) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 14.11.23 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 774fffc8b4..581ec6236a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.11.25)
+ chef (14.12.0)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.25)
+ chef-config (= 14.12.0)
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.11.25-universal-mingw32)
+ chef (14.12.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.11.25)
+ chef-config (= 14.12.0)
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.11.25)
+ chef-config (14.12.0)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 03f49c4896..d74fae13b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.11.25 \ No newline at end of file
+14.12.0 \ 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 2d94dbd352..62110d461e 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.11.25".freeze
+ VERSION = "14.12.0".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 947600aaf4..2fd769e20b 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.11.25")
+ VERSION = Chef::VersionString.new("14.12.0")
end
#