summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-06-04 05:48:57 +0000
committerChef Expeditor <chef-ci@chef.io>2019-06-04 05:48:57 +0000
commit04161b204afc7e79079af63081d44d1831bbb6a1 (patch)
treef434bd715fd384644cf286e3de6bce1caae6b59e
parent58fb2f23ea4daf7b4fae9a6538e42b08c6e87339 (diff)
downloadchef-04161b204afc7e79079af63081d44d1831bbb6a1.tar.gz
Bump version to 15.1.1 by Chef Expeditorv15.1.1
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 c6ea9804e3..39ca480880 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.1.0 -->
-## [v15.1.0](https://github.com/chef/chef/tree/v15.1.0) (2019-06-03)
+<!-- latest_release 15.1.1 -->
+## [v15.1.1](https://github.com/chef/chef/tree/v15.1.1) (2019-06-04)
#### Merged Pull Requests
-- Add hooks for plugins in knife bootstrap [#8628](https://github.com/chef/chef/pull/8628) ([btm](https://github.com/btm))
+- Create bootstrap template in binmode to fix line endings [#8631](https://github.com/chef/chef/pull/8631) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=15.0.300 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Create bootstrap template in binmode to fix line endings [#8631](https://github.com/chef/chef/pull/8631) ([btm](https://github.com/btm)) <!-- 15.1.1 -->
- Add hooks for plugins in knife bootstrap [#8628](https://github.com/chef/chef/pull/8628) ([btm](https://github.com/btm)) <!-- 15.1.0 -->
- Raise knife exceptions when verbosity is 3 (-VVV) [#8618](https://github.com/chef/chef/pull/8618) ([btm](https://github.com/btm)) <!-- 15.0.325 -->
- Trace output the actual bootstrap template filename [#8619](https://github.com/chef/chef/pull/8619) ([btm](https://github.com/btm)) <!-- 15.0.324 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2fe70964d0..456d6cfb47 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.1.0)
+ chef (15.1.1)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.0)
+ chef-config (= 15.1.1)
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.1.0-universal-mingw32)
+ chef (15.1.1-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.0)
+ chef-config (= 15.1.1)
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.1.0)
- chef (= 15.1.0)
+ chef-bin (15.1.1)
+ chef (= 15.1.1)
PATH
remote: chef-config
specs:
- chef-config (15.1.0)
+ chef-config (15.1.1)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 3dc9b03620..ebed9e6f51 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.0 \ No newline at end of file
+15.1.1 \ 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 97478f8202..d43a91c955 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.1.0".freeze
+ VERSION = "15.1.1".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c7e9743d14..d5456bd0bf 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.1.0".freeze
+ VERSION = "15.1.1".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 7f053dd044..d8b9dbe5c0 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.1.0")
+ VERSION = Chef::VersionString.new("15.1.1")
end
#