summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-05-26 16:37:24 +0000
committerChef Expeditor <expeditor@chef.io>2020-05-26 16:37:24 +0000
commit429e369ccab966aa0cc88ca29a529adc6e6e1791 (patch)
tree446b5adfd8c3eebf79d3d018ad471db339a14c41
parent0cd924d3a651f5d33ea283f7a9baff0401328eed (diff)
downloadchef-429e369ccab966aa0cc88ca29a529adc6e6e1791.tar.gz
Bump version to 15.11.4 by Chef Expeditorv15.11.4
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 26 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb5dd80dd7..053445872b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 15.11.4 -->
+## [v15.11.4](https://github.com/chef/chef/tree/v15.11.4) (2020-05-26)
+
+#### Merged Pull Requests
+- Pin habitat bundler to 1.17.3 [#9915](https://github.com/chef/chef/pull/9915) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=15.11.3 -->
+### Changes not yet released to stable
+
+#### Merged Pull Requests
+- Pin habitat bundler to 1.17.3 [#9915](https://github.com/chef/chef/pull/9915) ([tas50](https://github.com/tas50)) <!-- 15.11.4 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ae6a24110..92e94ed1fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.11.3)
+ chef (15.11.4)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.11.3)
- chef-utils (= 15.11.3)
+ chef-config (= 15.11.4)
+ chef-utils (= 15.11.4)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.11.3-universal-mingw32)
+ chef (15.11.4-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.11.3)
- chef-utils (= 15.11.3)
+ chef-config (= 15.11.4)
+ chef-utils (= 15.11.4)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.11.3)
- chef (= 15.11.3)
+ chef-bin (15.11.4)
+ chef (= 15.11.4)
PATH
remote: chef-config
specs:
- chef-config (15.11.3)
+ chef-config (15.11.4)
addressable
- chef-utils (= 15.11.3)
+ chef-utils (= 15.11.4)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.11.3)
+ chef-utils (15.11.4)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 66cea48e54..e917bb9c35 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.3 \ No newline at end of file
+15.11.4 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 08ceca062c..a573afba94 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.11.3".freeze
+ VERSION = "15.11.4".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 206ead210d..afd1f85b29 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.11.3".freeze
+ VERSION = "15.11.4".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index c349face55..087436244e 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.11.3".freeze
+ VERSION = "15.11.4".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e029fdb7e4..0deaa91149 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.11.3")
+ VERSION = Chef::VersionString.new("15.11.4")
end
#