summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-07-18 00:02:27 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-07-18 00:02:27 +0000
commit1bd742d6833a27c685907c414c3bb9c16d543bdd (patch)
tree65764ce0d01e3ac5aed6606c6ac42f59e757cad1
parent0f4bb0dcc9fab37a5105e6358638d84a3f578458 (diff)
downloadchef-1bd742d6833a27c685907c414c3bb9c16d543bdd.tar.gz
Bump version to 14.4.7 by Chef Expeditorv14.4.7
-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 9a6d2d7230..ec4c154dae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.5 -->
-## [v14.4.5](https://github.com/chef/chef/tree/v14.4.5) (2018-07-17)
+<!-- latest_release 14.4.7 -->
+## [v14.4.7](https://github.com/chef/chef/tree/v14.4.7) (2018-07-18)
#### Merged Pull Requests
-- group: convert to properties with descriptions and improve comma separated parsing [#7474](https://github.com/chef/chef/pull/7474) ([tas50](https://github.com/tas50))
+- Pull in the latest inspec-core and train-core [#7487](https://github.com/chef/chef/pull/7487) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Pull in the latest inspec-core and train-core [#7487](https://github.com/chef/chef/pull/7487) ([tas50](https://github.com/tas50)) <!-- 14.4.7 -->
- group: convert to properties with descriptions and improve comma separated parsing [#7474](https://github.com/chef/chef/pull/7474) ([tas50](https://github.com/tas50)) <!-- 14.4.5 -->
- Allow specifying VLAN &amp; Gateway on RHEL/Centos [#6400](https://github.com/chef/chef/pull/6400) ([tomdoherty](https://github.com/tomdoherty)) <!-- 14.4.3 -->
- ifconfig: Allow specifying VLAN on RHEL/Centos [#7478](https://github.com/chef/chef/pull/7478) ([tas50](https://github.com/tas50)) <!-- 14.4.2 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7994889b3b..06432a5a7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.6)
+ chef (14.4.7)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.6)
+ chef-config (= 14.4.7)
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.4.6-universal-mingw32)
+ chef (14.4.7-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.6)
+ chef-config (= 14.4.7)
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.4.6)
+ chef-config (14.4.7)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index c8428cf8f7..7a77183852 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.6 \ No newline at end of file
+14.4.7 \ 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 5ab643a500..b554f14b52 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.4.6".freeze
+ VERSION = "14.4.7".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4aed8ebc99..3f31a5f893 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.4.6")
+ VERSION = Chef::VersionString.new("14.4.7")
end
#