summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-21 19:05:30 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-21 19:05:30 +0000
commitd0481fe73afe5b60b48cab25ae8a73bc74b187a5 (patch)
treeb566695d1463d69358a6f55efe3ab6ed11ded50b
parent3d3d15513e9ae9d6cf193be0043cc4bcca677fb7 (diff)
downloadchef-15.10.11.tar.gz
Bump version to 15.10.11 by Chef Expeditorv15.10.11
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-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, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 467d5e1a7d..4e1501c08e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.10.10 -->
-## [v15.10.10](https://github.com/chef/chef/tree/v15.10.10) (2020-04-21)
+<!-- latest_release 15.10.11 -->
+## [v15.10.11](https://github.com/chef/chef/tree/v15.10.11) (2020-04-21)
#### Merged Pull Requests
-- Remove &quot;Code Can&quot; from dmg background [#9702](https://github.com/chef/chef/pull/9702) ([tas50](https://github.com/tas50))
+- Update omnibus-software to resolve shipping 2 copies of pry [#9701](https://github.com/chef/chef/pull/9701) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.9.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update omnibus-software to resolve shipping 2 copies of pry [#9701](https://github.com/chef/chef/pull/9701) ([tas50](https://github.com/tas50)) <!-- 15.10.11 -->
- Remove &quot;Code Can&quot; from dmg background [#9702](https://github.com/chef/chef/pull/9702) ([tas50](https://github.com/tas50)) <!-- 15.10.10 -->
- Produce aarch64 Amazon Linux 2 packages [#9680](https://github.com/chef/chef/pull/9680) ([tas50](https://github.com/tas50)) <!-- 15.10.9 -->
- Add deprecation warnings at the end of the run after the end of April 2021 [#9667](https://github.com/chef/chef/pull/9667) ([tas50](https://github.com/tas50)) <!-- 15.10.8 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c79d75d4e..c0b15374c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.10.10)
+ chef (15.10.11)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.10.10)
- chef-utils (= 15.10.10)
+ chef-config (= 15.10.11)
+ chef-utils (= 15.10.11)
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.10.10-universal-mingw32)
+ chef (15.10.11-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.10.10)
- chef-utils (= 15.10.10)
+ chef-config (= 15.10.11)
+ chef-utils (= 15.10.11)
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.10.10)
- chef (= 15.10.10)
+ chef-bin (15.10.11)
+ chef (= 15.10.11)
PATH
remote: chef-config
specs:
- chef-config (15.10.10)
+ chef-config (15.10.11)
addressable
- chef-utils (= 15.10.10)
+ chef-utils (= 15.10.11)
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.10.10)
+ chef-utils (15.10.11)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 5b97558549..1c6fd40a7e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.10.10 \ No newline at end of file
+15.10.11 \ 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 53935978ed..1e5ab00f55 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.10.10".freeze
+ VERSION = "15.10.11".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 50cd09ae35..1dd065df65 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.10.10".freeze
+ VERSION = "15.10.11".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index faf8dee200..d61f2183ae 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.10.10".freeze
+ VERSION = "15.10.11".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6cf137cd8e..35058545cd 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.10.10")
+ VERSION = Chef::VersionString.new("15.10.11")
end
#