summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-11-03 01:45:50 +0000
committerChef Expeditor <expeditor@chef.io>2019-11-03 01:45:50 +0000
commit52734604df488abd25db7264573bae1ccbcde377 (patch)
tree5d361192c490f901c73ec55966705cd40a52c8d6
parent5ddb116f74bf363a949b2983dce8d2972a1597c6 (diff)
downloadchef-52734604df488abd25db7264573bae1ccbcde377.tar.gz
Bump version to 15.4.60 by Chef Expeditorv15.4.60
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-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--lib/chef/version.rb2
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fc688e487..cbd1565573 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.4.59 -->
-## [v15.4.59](https://github.com/chef/chef/tree/v15.4.59) (2019-11-01)
+<!-- latest_release 15.4.60 -->
+## [v15.4.60](https://github.com/chef/chef/tree/v15.4.60) (2019-11-03)
#### Merged Pull Requests
-- a Windows Habitat plan [#8900](https://github.com/chef/chef/pull/8900) ([robbkidd](https://github.com/robbkidd))
+- Bump omnibus to 6.1.10 [#9048](https://github.com/chef/chef/pull/9048) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=15.4.45 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Bump omnibus to 6.1.10 [#9048](https://github.com/chef/chef/pull/9048) ([btm](https://github.com/btm)) <!-- 15.4.60 -->
- a Windows Habitat plan [#8900](https://github.com/chef/chef/pull/8900) ([robbkidd](https://github.com/robbkidd)) <!-- 15.4.59 -->
- Fix multiple chefignore file issues [#8925](https://github.com/chef/chef/pull/8925) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.58 -->
- Allow for the mixlib-authentication 3.x gem [#9040](https://github.com/chef/chef/pull/9040) ([tas50](https://github.com/tas50)) <!-- 15.4.57 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 1bf2633cf5..cf7d862d3d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.4.59)
+ chef (15.4.60)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.59)
+ chef-config (= 15.4.60)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -58,11 +58,11 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.4.59-universal-mingw32)
+ chef (15.4.60-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.59)
+ chef-config (= 15.4.60)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -105,13 +105,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.4.59)
- chef (= 15.4.59)
+ chef-bin (15.4.60)
+ chef (= 15.4.60)
PATH
remote: chef-config
specs:
- chef-config (15.4.59)
+ chef-config (15.4.60)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 9f65eb211d..eac54a5021 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.59 \ No newline at end of file
+15.4.60 \ 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 49c0a3870f..b2d1b37070 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.4.59".freeze
+ VERSION = "15.4.60".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index f97292413c..3efba8a1a8 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 = "15.4.59".freeze
+ VERSION = "15.4.60".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 40685e1667..ae09ad7754 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.4.59")
+ VERSION = Chef::VersionString.new("15.4.60")
end
#