summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-07 17:17:53 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-07 17:17:53 +0000
commitd502c68ecbfe6ef1e23495ea45fda279cbc38e08 (patch)
treece239980a48b8b4217de61a4b0856394b66035ea
parent565b4281b0976c8eaf4d743999b20bcf77a7e427 (diff)
downloadchef-15.0.268.tar.gz
Bump version to 15.0.268 by Chef Expeditorv15.0.268
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 fa33aa4e7d..8bb073b80d 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.267 -->
-## [v15.0.267](https://github.com/chef/chef/tree/v15.0.267) (2019-05-07)
+<!-- latest_release 15.0.268 -->
+## [v15.0.268](https://github.com/chef/chef/tree/v15.0.268) (2019-05-07)
#### Merged Pull Requests
-- Chef 15: Unable to create temp dir on windows system [#8476](https://github.com/chef/chef/pull/8476) ([vsingh-msys](https://github.com/vsingh-msys))
+- Remove the Chef 11 admin flag from knife client create [#8473](https://github.com/chef/chef/pull/8473) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Remove the Chef 11 admin flag from knife client create [#8473](https://github.com/chef/chef/pull/8473) ([tas50](https://github.com/tas50)) <!-- 15.0.268 -->
- Chef 15: Unable to create temp dir on windows system [#8476](https://github.com/chef/chef/pull/8476) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.0.267 -->
- Initial target_mode implementation [#7758](https://github.com/chef/chef/pull/7758) ([btm](https://github.com/btm)) <!-- 15.0.266 -->
- Add logic to require acceptannce of the Chef license to run the client [#8354](https://github.com/chef/chef/pull/8354) ([tyler-ball](https://github.com/tyler-ball)) <!-- 15.0.265 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 913ea45b03..a515c6e557 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.267)
+ chef (15.0.268)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.267)
+ chef-config (= 15.0.268)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -57,11 +57,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.0.267-universal-mingw32)
+ chef (15.0.268-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.267)
+ chef-config (= 15.0.268)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -103,13 +103,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.0.267)
- chef (= 15.0.267)
+ chef-bin (15.0.268)
+ chef (= 15.0.268)
PATH
remote: chef-config
specs:
- chef-config (15.0.267)
+ chef-config (15.0.268)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 4caf8efc5c..0eb529bcdf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.267 \ No newline at end of file
+15.0.268 \ 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 1c61e1030a..76af275aec 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.0.267".freeze
+ VERSION = "15.0.268".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index db11e869dc..f8a5b1aa8a 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.267".freeze
+ VERSION = "15.0.268".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9aa3a6a526..4aca7d072d 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.267")
+ VERSION = Chef::VersionString.new("15.0.268")
end
#