summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-17 01:50:37 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-17 01:50:37 +0000
commita074d491722bf665da843e76672ffbadf92e3661 (patch)
treee73921725377742f55384a51a3aa4cb850504364
parent7d6774fc47de4e1bba13d1fdc520201c7e3db88d (diff)
downloadchef-a074d491722bf665da843e76672ffbadf92e3661.tar.gz
Bump version to 14.1.15 by Chef Expeditorv14.1.15
-rw-r--r--CHANGELOG.md6
-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, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b57f1335a2..6aa6844003 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 14.1.15 -->
+## [v14.1.15](https://github.com/chef/chef/tree/v14.1.15) (2018-05-17)
#### Merged Pull Requests
+- Add default_action to the resource inspector [#7276](https://github.com/chef/chef/pull/7276) ([tas50](https://github.com/tas50))
- Add additional resource unit tests [#7275](https://github.com/chef/chef/pull/7275) ([tas50](https://github.com/tas50))
- Add additional unit tests for resource actions/properties [#7266](https://github.com/chef/chef/pull/7266) ([tas50](https://github.com/tas50))
<!-- latest_release -->
@@ -11,6 +12,7 @@
### Changes since 14.1.12 release
#### Merged Pull Requests
+- Add default_action to the resource inspector [#7276](https://github.com/chef/chef/pull/7276) ([tas50](https://github.com/tas50)) <!-- 14.1.15 -->
- Add additional resource unit tests [#7275](https://github.com/chef/chef/pull/7275) ([tas50](https://github.com/tas50)) <!-- 14.1.14 -->
- Add additional unit tests for resource actions/properties [#7266](https://github.com/chef/chef/pull/7266) ([tas50](https://github.com/tas50)) <!-- 14.1.14 -->
- improved regex accuracy lib/chef/resource/hostname.rb [#7262](https://github.com/chef/chef/pull/7262) ([bottkv488](https://github.com/bottkv488)) <!-- 14.1.14 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index dd70dbe9e7..ad52f6a742 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.1.14)
+ chef (14.1.15)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.14)
+ chef-config (= 14.1.15)
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.14-universal-mingw32)
+ chef (14.1.15-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.14)
+ chef-config (= 14.1.15)
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.14)
+ chef-config (14.1.15)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 09f594ddc0..3f74d5912e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.14 \ No newline at end of file
+14.1.15 \ 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 2bde394458..4aa9813e0c 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.14"
+ VERSION = "14.1.15"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 42c6b4ab56..9b93234cc7 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.14")
+ VERSION = Chef::VersionString.new("14.1.15")
end
#