summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-24 05:53:35 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-24 05:53:35 +0000
commit6d6ef7d068b18f4eb47a79790f5cdf1ff40d669c (patch)
tree4989aa0785f65c8edfa0017095b0b2c3df10c82c
parentcefc685ad328ec2cdd1fc4e5d8cfb3e691f678cb (diff)
downloadchef-6d6ef7d068b18f4eb47a79790f5cdf1ff40d669c.tar.gz
Bump version to 15.0.309 by Chef Expeditorv15.0.309
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 8e9e80f5e5..46289ea5a8 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.308 -->
-## [v15.0.308](https://github.com/chef/chef/tree/v15.0.308) (2019-05-24)
+<!-- latest_release 15.0.309 -->
+## [v15.0.309](https://github.com/chef/chef/tree/v15.0.309) (2019-05-24)
#### Merged Pull Requests
-- Better target mode shell_out [#8584](https://github.com/chef/chef/pull/8584) ([lamont-granquist](https://github.com/lamont-granquist))
+- Preserve train connection in target mode to prevent running duplicate OS detection commands [#8590](https://github.com/chef/chef/pull/8590) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=15.0.300 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Preserve train connection in target mode to prevent running duplicate OS detection commands [#8590](https://github.com/chef/chef/pull/8590) ([btm](https://github.com/btm)) <!-- 15.0.309 -->
- Better target mode shell_out [#8584](https://github.com/chef/chef/pull/8584) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.308 -->
- Fix service enable idempotency in sles11 [#8256](https://github.com/chef/chef/pull/8256) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 15.0.307 -->
- Fix delete_resource for resources [#8570](https://github.com/chef/chef/pull/8570) ([artem-sidorenko](https://github.com/artem-sidorenko)) <!-- 15.0.306 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5669ecc290..67fd6eb577 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.0.308)
+ chef (15.0.309)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.308)
+ chef-config (= 15.0.309)
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.308-universal-mingw32)
+ chef (15.0.309-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.0.308)
+ chef-config (= 15.0.309)
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.308)
- chef (= 15.0.308)
+ chef-bin (15.0.309)
+ chef (= 15.0.309)
PATH
remote: chef-config
specs:
- chef-config (15.0.308)
+ chef-config (15.0.309)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 746aece692..e6ddf290d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.308 \ No newline at end of file
+15.0.309 \ 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 da8807efdf..9b38a7a76e 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.308".freeze
+ VERSION = "15.0.309".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index b1b0df1c6d..1ad151c84f 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.308".freeze
+ VERSION = "15.0.309".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f99ec18b7b..7a42d29fd4 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.0.308")
+ VERSION = Chef::VersionString.new("15.0.309")
end
#