summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-04 17:27:19 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-04 17:27:19 +0000
commit9296f435291fc361b7f566952436a18febfefc7f (patch)
tree8cfe27998bed7406bce5c2023503cf21d999c1e1
parentbfeb7c1dae211ec574ee3d27fe41b8c954862c9f (diff)
downloadchef-9296f435291fc361b7f566952436a18febfefc7f.tar.gz
Bump version to 14.6.12 by Chef Expeditorv14.6.12
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 507a197ccf..b01b5e8ab7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.11 -->
-## [v14.6.11](https://github.com/chef/chef/tree/v14.6.11) (2018-10-02)
+<!-- latest_release 14.6.12 -->
+## [v14.6.12](https://github.com/chef/chef/tree/v14.6.12) (2018-10-04)
#### Merged Pull Requests
-- fixed typo in description property of rhsm_errata_level resource [#7710](https://github.com/chef/chef/pull/7710) ([freakinhippie](https://github.com/freakinhippie))
+- Bump inspec-core to 2.3.5 [#7709](https://github.com/chef/chef/pull/7709) ([chef-ci](https://github.com/chef-ci))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Bump inspec-core to 2.3.5 [#7709](https://github.com/chef/chef/pull/7709) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.12 -->
- fixed typo in description property of rhsm_errata_level resource [#7710](https://github.com/chef/chef/pull/7710) ([freakinhippie](https://github.com/freakinhippie)) <!-- 14.6.11 -->
- add some big FIXMEs [#7706](https://github.com/chef/chef/pull/7706) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.10 -->
- short circuit before the version_compare call [#7705](https://github.com/chef/chef/pull/7705) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 77a9b42517..1224f6362f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.11)
+ chef (14.6.12)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.11)
+ chef-config (= 14.6.12)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.11-universal-mingw32)
+ chef (14.6.12-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.11)
+ chef-config (= 14.6.12)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.6.11)
+ chef-config (14.6.12)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 4c9480e5a3..4e1923994b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.11 \ No newline at end of file
+14.6.12 \ 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 baebffa60c..e664216c3b 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.6.11".freeze
+ VERSION = "14.6.12".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4bf3c1be00..f25c336e03 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.6.11")
+ VERSION = Chef::VersionString.new("14.6.12")
end
#