summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-16 16:33:41 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-16 16:33:41 +0000
commita12c2bcbe798515d32e63b9d97818ad1985dffc4 (patch)
tree904a6451ee3acf603c21b88d59f2bd0763050ac3
parent7c2950ef5fcafc127b700cba123d57b5e6273c21 (diff)
downloadchef-a12c2bcbe798515d32e63b9d97818ad1985dffc4.tar.gz
Bump version to 14.1.14 by Chef Expeditorv14.1.14
-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 955d20c9cd..8083326a92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.1.13 -->
-## [v14.1.13](https://github.com/chef/chef/tree/v14.1.13) (2018-05-16)
+<!-- latest_release 14.1.14 -->
+## [v14.1.14](https://github.com/chef/chef/tree/v14.1.14) (2018-05-16)
#### Merged Pull Requests
-- publish habitat packages [#7272](https://github.com/chef/chef/pull/7272) ([thommay](https://github.com/thommay))
+- improved regex accuracy lib/chef/resource/hostname.rb [#7262](https://github.com/chef/chef/pull/7262) ([bottkv488](https://github.com/bottkv488))
<!-- latest_release -->
<!-- release_rollup since=14.1.12 -->
### Changes since 14.1.12 release
#### Merged Pull Requests
+- improved regex accuracy lib/chef/resource/hostname.rb [#7262](https://github.com/chef/chef/pull/7262) ([bottkv488](https://github.com/bottkv488)) <!-- 14.1.14 -->
- publish habitat packages [#7272](https://github.com/chef/chef/pull/7272) ([thommay](https://github.com/thommay)) <!-- 14.1.13 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3eed58bd6b..dd70dbe9e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.1.13)
+ chef (14.1.14)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.13)
+ chef-config (= 14.1.14)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -46,10 +46,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.1.13-universal-mingw32)
+ chef (14.1.14-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.13)
+ chef-config (= 14.1.14)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.1.13)
+ chef-config (14.1.14)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index fe015d0575..09f594ddc0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.13 \ No newline at end of file
+14.1.14 \ 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 2fba225829..2bde394458 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.1.13"
+ VERSION = "14.1.14"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f7f8e7aca7..42c6b4ab56 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.1.13")
+ VERSION = Chef::VersionString.new("14.1.14")
end
#