summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-07 19:10:17 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-07 19:10:17 +0000
commit0349dbb13743c80bb82603d6513c0619ed3cbaab (patch)
tree33ce987591b668d4a98f529af70730e8a57425c0
parent2f6b2bdb6267762ccd80aeb9fc010b7b2135982e (diff)
downloadchef-0349dbb13743c80bb82603d6513c0619ed3cbaab.tar.gz
Bump version to 14.7.15 by Chef Expeditorv14.7.15
Obvious fix; these changes are the result of automation not creative thinking.
-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 64e85baa61..3bf191f76c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.7.14 -->
-## [v14.7.14](https://github.com/chef/chef/tree/v14.7.14) (2018-11-07)
+<!-- latest_release 14.7.15 -->
+## [v14.7.15](https://github.com/chef/chef/tree/v14.7.15) (2018-11-07)
#### Merged Pull Requests
-- Backport: Resource property description updates [#7887](https://github.com/chef/chef/pull/7887) ([tas50](https://github.com/tas50))
+- Backport: Allow multiple local and remote ports in the windows_firewall_rule resource [#7888](https://github.com/chef/chef/pull/7888) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.6.47 -->
### Changes since 14.6.47 release
#### Merged Pull Requests
+- Backport: Allow multiple local and remote ports in the windows_firewall_rule resource [#7888](https://github.com/chef/chef/pull/7888) ([tas50](https://github.com/tas50)) <!-- 14.7.15 -->
- Backport: Resource property description updates [#7887](https://github.com/chef/chef/pull/7887) ([tas50](https://github.com/tas50)) <!-- 14.7.14 -->
- Backport: Add windows_firewall_rule resource [#7876](https://github.com/chef/chef/pull/7876) ([tas50](https://github.com/tas50)) <!-- 14.7.13 -->
- Add more validation_messages to properties [#7875](https://github.com/chef/chef/pull/7875) ([tas50](https://github.com/tas50)) <!-- 14.7.12 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index bd4302574d..e32be92909 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.7.14)
+ chef (14.7.15)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.14)
+ chef-config (= 14.7.15)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.7.14-universal-mingw32)
+ chef (14.7.15-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.14)
+ chef-config (= 14.7.15)
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.7.14)
+ chef-config (14.7.15)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 44e80262ba..c5ddf46707 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.14 \ No newline at end of file
+14.7.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 81974ed2be..c73d948076 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.7.14".freeze
+ VERSION = "14.7.15".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ba555055c2..fc9e3a154c 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.7.14")
+ VERSION = Chef::VersionString.new("14.7.15")
end
#