summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-28 20:25:58 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-28 20:25:58 +0000
commitfad2d09ca9d06dd98dd726c6ab622f46e7085995 (patch)
treeffd05239242fc1f8824abc9514766d72e67f9b7a
parent2aa38b678cad9c36a7d6839b791a22136624907d (diff)
downloadchef-fad2d09ca9d06dd98dd726c6ab622f46e7085995.tar.gz
Bump version to 15.0.147 by Chef Expeditorv15.0.147
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 6193ed1b1a..0e8c7aef19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.146 -->
-## [v15.0.146](https://github.com/chef/chef/tree/v15.0.146) (2019-01-28)
+<!-- latest_release 15.0.147 -->
+## [v15.0.147](https://github.com/chef/chef/tree/v15.0.147) (2019-01-28)
#### Merged Pull Requests
-- Cleanup requires / includes in knife supermarket [#8166](https://github.com/chef/chef/pull/8166) ([tas50](https://github.com/tas50))
+- [knife] Remove duplicate code blocks in the knife cookbook upload command [#8135](https://github.com/chef/chef/pull/8135) ([f9n](https://github.com/f9n))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- [knife] Remove duplicate code blocks in the knife cookbook upload command [#8135](https://github.com/chef/chef/pull/8135) ([f9n](https://github.com/f9n)) <!-- 15.0.147 -->
- Cleanup requires / includes in knife supermarket [#8166](https://github.com/chef/chef/pull/8166) ([tas50](https://github.com/tas50)) <!-- 15.0.146 -->
- Misc YARD updates for knife [#8169](https://github.com/chef/chef/pull/8169) ([tas50](https://github.com/tas50)) <!-- 15.0.145 -->
- Remove support for unsupported opensuse &lt; 42 from group provider [#8158](https://github.com/chef/chef/pull/8158) ([tas50](https://github.com/tas50)) <!-- 15.0.144 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index aed86f0833..c0b7fdad4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.146)
+ chef (15.0.147)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.146)
+ chef-config (= 15.0.147)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.146-universal-mingw32)
+ chef (15.0.147-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.146)
+ chef-config (= 15.0.147)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.146)
+ chef-config (15.0.147)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 7fc77a5115..8175a04078 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.146 \ No newline at end of file
+15.0.147 \ 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 e0b9649021..e6a7469f68 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.0.146".freeze
+ VERSION = "15.0.147".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index caa9072918..9cec9efdae 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("15.0.146")
+ VERSION = Chef::VersionString.new("15.0.147")
end
#