summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-07-16 23:14:15 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-07-16 23:14:15 +0000
commitb16395156099ed6b67e4b235ae006b27a6f747f9 (patch)
tree44d493ab5df4aa83c52753a82ca612bbeba5198d
parentad6760303f10bef9e97aa3fe4b681e2dc78b9f2c (diff)
downloadchef-b16395156099ed6b67e4b235ae006b27a6f747f9.tar.gz
Bump version to 14.4.2 by Chef Expeditorv14.4.2
-rw-r--r--CHANGELOG.md8
-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, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78c24f6d44..af7266b580 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.1 -->
-## [v14.4.1](https://github.com/chef/chef/tree/v14.4.1) (2018-07-16)
+<!-- latest_release 14.4.2 -->
+## [v14.4.2](https://github.com/chef/chef/tree/v14.4.2) (2018-07-16)
#### Merged Pull Requests
-- add back clean_array API [#7477](https://github.com/chef/chef/pull/7477) ([lamont-granquist](https://github.com/lamont-granquist))
-- Bump version to 14.4.0 [#7476](https://github.com/chef/chef/pull/7476) ([tas50](https://github.com/tas50))
+- ifconfig: Allow specifying VLAN on RHEL/Centos [#7478](https://github.com/chef/chef/pull/7478) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- ifconfig: Allow specifying VLAN on RHEL/Centos [#7478](https://github.com/chef/chef/pull/7478) ([tas50](https://github.com/tas50)) <!-- 14.4.2 -->
- add back clean_array API [#7477](https://github.com/chef/chef/pull/7477) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.4.1 -->
- Bump version to 14.4.0 [#7476](https://github.com/chef/chef/pull/7476) ([tas50](https://github.com/tas50)) <!-- 14.4.0 -->
- Make gem_installer generate a valid Gemfile [#6168](https://github.com/chef/chef/pull/6168) ([oclaussen](https://github.com/oclaussen)) <!-- 14.3.46 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e785e3e9cc..0b07c3d723 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.1)
+ chef (14.4.2)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.1)
+ chef-config (= 14.4.2)
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.1-universal-mingw32)
+ chef (14.4.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.1)
+ chef-config (= 14.4.2)
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.1)
+ chef-config (14.4.2)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 97ea4c05ce..afc1b70fc5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.1 \ No newline at end of file
+14.4.2 \ 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 fe61890164..081d97e78b 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.1".freeze
+ VERSION = "14.4.2".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 024d78506a..52eba7bcc6 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.1")
+ VERSION = Chef::VersionString.new("14.4.2")
end
#