summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-22 22:46:02 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-22 22:46:02 +0000
commit9eb78fa2d0edb9366fc2bc34f9ec3954fda48261 (patch)
treed50e76be871e3cc81126411c6c3c7cefb9991e14
parent3ac1a79d775a691e5871417213e73ac86830cae5 (diff)
downloadchef-9eb78fa2d0edb9366fc2bc34f9ec3954fda48261.tar.gz
Bump version to 14.0.15 by Expeditorv14.0.15
-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 d61ed6fd01..d43a52bd66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.14 -->
-## [v14.0.14](https://github.com/chef/chef/tree/v14.0.14) (2018-01-22)
+<!-- latest_release 14.0.15 -->
+## [v14.0.15](https://github.com/chef/chef/tree/v14.0.15) (2018-01-22)
#### Merged Pull Requests
-- Rename the OpenSSL mixin to avoid name conflicts [#6764](https://github.com/chef/chef/pull/6764) ([tas50](https://github.com/tas50))
+- Remove node.set and node.set_unless attribute levels [#6762](https://github.com/chef/chef/pull/6762) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Remove node.set and node.set_unless attribute levels [#6762](https://github.com/chef/chef/pull/6762) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.15 -->
- Rename the OpenSSL mixin to avoid name conflicts [#6764](https://github.com/chef/chef/pull/6764) ([tas50](https://github.com/tas50)) <!-- 14.0.14 -->
- Revert &quot;add create and delete actions for windows_service&quot; [#6763](https://github.com/chef/chef/pull/6763) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.13 -->
- Convert actions in Chef::Resource::Notification to symbols to prevent double notification [#6515](https://github.com/chef/chef/pull/6515) ([dimsh99](https://github.com/dimsh99)) <!-- 14.0.12 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c2928fbf0..cce2b4fadb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.14)
+ chef (14.0.15)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.14)
+ chef-config (= 14.0.15)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.14-universal-mingw32)
+ chef (14.0.15-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.14)
+ chef-config (= 14.0.15)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.14)
+ chef-config (14.0.15)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index ce07870565..400dc384e4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.14 \ No newline at end of file
+14.0.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 524080828c..3e029a209d 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.0.14"
+ VERSION = "14.0.15"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9b9b29e633..ae2ac100a4 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.0.14")
+ VERSION = Chef::VersionString.new("14.0.15")
end
#