summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-10-17 16:57:32 +0000
committerChef Expeditor <expeditor@chef.io>2019-10-17 16:57:32 +0000
commit33dc27f56dcda80a0ee060e7e2ae4001106439b1 (patch)
treefde6297d908fce65ca61178cd921d0d10e805ce0
parent804cbf70a982cc376ddfdf60dd26c816a3c9975e (diff)
downloadchef-33dc27f56dcda80a0ee060e7e2ae4001106439b1.tar.gz
Bump version to 15.4.46 by Chef Expeditorv15.4.46
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-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, 21 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a610846c15..4aaca9daa3 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.4.46 -->
+## [v15.4.46](https://github.com/chef/chef/tree/v15.4.46) (2019-10-17)
+
+#### Merged Pull Requests
+- Sync over resource documentation from the docs site [#8999](https://github.com/chef/chef/pull/8999) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=15.4.45 -->
+### Changes not yet released to stable
+
+#### Merged Pull Requests
+- Sync over resource documentation from the docs site [#8999](https://github.com/chef/chef/pull/8999) ([tas50](https://github.com/tas50)) <!-- 15.4.46 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index dd230ddda6..8717309dd6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.4.45)
+ chef (15.4.46)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.45)
+ chef-config (= 15.4.46)
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.45-universal-mingw32)
+ chef (15.4.46-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.45)
+ chef-config (= 15.4.46)
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.45)
- chef (= 15.4.45)
+ chef-bin (15.4.46)
+ chef (= 15.4.46)
PATH
remote: chef-config
specs:
- chef-config (15.4.45)
+ chef-config (15.4.46)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index a28d7cbacf..0ac2137ccf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.45 \ No newline at end of file
+15.4.46 \ 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 5247625893..587539d260 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.45".freeze
+ VERSION = "15.4.46".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 3cb9a9a705..0c81f1931b 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.45".freeze
+ VERSION = "15.4.46".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e64400a7a4..ba1fe40d8c 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.45")
+ VERSION = Chef::VersionString.new("15.4.46")
end
#