summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-10-15 16:12:03 +0000
committerChef Expeditor <expeditor@chef.io>2019-10-15 16:12:03 +0000
commite1201548cc0e42207a773b99133b1a0ce8d5424a (patch)
tree669a3e3212047b7b1ea4249bdd085d0753c5bdac
parentc40da3e1689050ec7317e9d46b00bb3291a283cd (diff)
downloadchef-e1201548cc0e42207a773b99133b1a0ce8d5424a.tar.gz
Bump version to 15.4.43 by Chef Expeditorv15.4.43
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 17969eea0a..d7e7aa0f3e 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.42 -->
-## [v15.4.42](https://github.com/chef/chef/tree/v15.4.42) (2019-10-15)
+<!-- latest_release 15.4.43 -->
+## [v15.4.43](https://github.com/chef/chef/tree/v15.4.43) (2019-10-15)
#### Merged Pull Requests
-- Fix typo for knife download --[no]diff and --[-no]force options. [#8995](https://github.com/chef/chef/pull/8995) ([Vasu1105](https://github.com/Vasu1105))
+- [knife] Deprecate data bag secret (-s) short option due to conflict with --server-url option [#8909](https://github.com/chef/chef/pull/8909) ([vsingh-msys](https://github.com/vsingh-msys))
<!-- latest_release -->
<!-- release_rollup since=15.3.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- [knife] Deprecate data bag secret (-s) short option due to conflict with --server-url option [#8909](https://github.com/chef/chef/pull/8909) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.43 -->
- Fix typo for knife download --[no]diff and --[-no]force options. [#8995](https://github.com/chef/chef/pull/8995) ([Vasu1105](https://github.com/Vasu1105)) <!-- 15.4.42 -->
- Enhance knife supermarket list &amp; search [#8971](https://github.com/chef/chef/pull/8971) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.41 -->
- Using umask to avoid race conditions in bootstrap [#8895](https://github.com/chef/chef/pull/8895) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.4.40 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 163c0dc11d..7585a6d3fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.4.42)
+ chef (15.4.43)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.42)
+ chef-config (= 15.4.43)
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.42-universal-mingw32)
+ chef (15.4.43-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.4.42)
+ chef-config (= 15.4.43)
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.42)
- chef (= 15.4.42)
+ chef-bin (15.4.43)
+ chef (= 15.4.43)
PATH
remote: chef-config
specs:
- chef-config (15.4.42)
+ chef-config (15.4.43)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index c07b69bea7..d0681e15c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.42 \ No newline at end of file
+15.4.43 \ 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 317d7549ff..056b01e93f 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.42".freeze
+ VERSION = "15.4.43".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 24d6df0200..0ad414080f 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.42".freeze
+ VERSION = "15.4.43".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 11fc610d7e..7fd2ee3669 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.42")
+ VERSION = Chef::VersionString.new("15.4.43")
end
#