summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-07-02 18:03:09 +0000
committerChef Expeditor <chef-ci@chef.io>2019-07-02 18:03:09 +0000
commit411e04a84627c305557b6fa94c9ade39fd69de53 (patch)
tree3068f7af877fea297053c4c2e3e931a7fd6aa96f
parent79e0366a234eba16cbd77833e2fe90aebaec1e97 (diff)
downloadchef-411e04a84627c305557b6fa94c9ade39fd69de53.tar.gz
Bump version to 15.1.40 by Chef Expeditorv15.1.40
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 1b2803d00f..fcfcf77c9c 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.39 -->
-## [v15.1.39](https://github.com/chef/chef/tree/v15.1.39) (2019-07-02)
+<!-- latest_release 15.1.40 -->
+## [v15.1.40](https://github.com/chef/chef/tree/v15.1.40) (2019-07-02)
#### Merged Pull Requests
-- update bldr config with new hab package name [#8706](https://github.com/chef/chef/pull/8706) ([robbkidd](https://github.com/robbkidd))
+- fixes for chefstyle bump [#8707](https://github.com/chef/chef/pull/8707) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=15.1.36 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- fixes for chefstyle bump [#8707](https://github.com/chef/chef/pull/8707) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.1.40 -->
- update bldr config with new hab package name [#8706](https://github.com/chef/chef/pull/8706) ([robbkidd](https://github.com/robbkidd)) <!-- 15.1.39 -->
- windows_task: Fix for :day option is not accepting integer value [#8705](https://github.com/chef/chef/pull/8705) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.1.38 -->
- Bump inspec-core to 4.6.9 [#8701](https://github.com/chef/chef/pull/8701) ([chef-ci](https://github.com/chef-ci)) <!-- 15.1.37 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index df290ae886..2bb7f2ffd4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.1.39)
+ chef (15.1.40)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.39)
+ chef-config (= 15.1.40)
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.39-universal-mingw32)
+ chef (15.1.40-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.39)
+ chef-config (= 15.1.40)
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.39)
- chef (= 15.1.39)
+ chef-bin (15.1.40)
+ chef (= 15.1.40)
PATH
remote: chef-config
specs:
- chef-config (15.1.39)
+ chef-config (15.1.40)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 0f5e15ba02..576c5feb9f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.39 \ No newline at end of file
+15.1.40 \ 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 a4c25d2a28..89f1368005 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.39".freeze
+ VERSION = "15.1.40".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c20f2d70be..85bc83dd64 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.39".freeze
+ VERSION = "15.1.40".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2c37b464e6..cebcc8f07a 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.39")
+ VERSION = Chef::VersionString.new("15.1.40")
end
#