summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-02 20:24:12 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-02 20:24:12 +0000
commit3f30b9153cecfdbcdfed9bdd280e1b78a9d333ef (patch)
tree3ebaeb3244cca5b9b703d27ffd34f0c01a2b2ae8
parent3ea5ff32209892abb9ccb25f166a49a89a409648 (diff)
downloadchef-3f30b9153cecfdbcdfed9bdd280e1b78a9d333ef.tar.gz
Bump version to 14.0.185 by Expeditorv14.0.185
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ce784f3a5..7f02b30561 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.184 -->
-## [v14.0.184](https://github.com/chef/chef/tree/v14.0.184) (2018-04-02)
+<!-- latest_release 14.0.185 -->
+## [v14.0.185](https://github.com/chef/chef/tree/v14.0.185) (2018-04-02)
#### Merged Pull Requests
-- scrub tempfile names [#7104](https://github.com/chef/chef/pull/7104) ([lamont-granquist](https://github.com/lamont-granquist))
+- Address possible gem installs between interval runs that are then used in the config [#7106](https://github.com/chef/chef/pull/7106) ([coderanger](https://github.com/coderanger))
<!-- latest_release -->
<!-- release_rollup since=13.8.5 -->
### Changes since 13.8.5 release
#### Merged Pull Requests
+- Address possible gem installs between interval runs that are then used in the config [#7106](https://github.com/chef/chef/pull/7106) ([coderanger](https://github.com/coderanger)) <!-- 14.0.185 -->
- scrub tempfile names [#7104](https://github.com/chef/chef/pull/7104) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.184 -->
- homebrew_tap / homebrew_cask: Fix compile time errors with the user mixin [#7097](https://github.com/chef/chef/pull/7097) ([tas50](https://github.com/tas50)) <!-- 14.0.183 -->
- Bump Ruby to 2.5.1 [#7090](https://github.com/chef/chef/pull/7090) ([tas50](https://github.com/tas50)) <!-- 14.0.182 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c306ca6035..96ff07a151 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.184)
+ chef (14.0.185)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.184)
+ chef-config (= 14.0.185)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -45,10 +45,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.184-universal-mingw32)
+ chef (14.0.185-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.184)
+ chef-config (= 14.0.185)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -90,7 +90,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.184)
+ chef-config (14.0.185)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index eb32e17200..74ee9d420a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.184 \ No newline at end of file
+14.0.185 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 8679f601d7..0adcc570f9 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 = "14.0.184"
+ VERSION = "14.0.185"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 906cc1f4b3..244b437240 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("14.0.184")
+ VERSION = Chef::VersionString.new("14.0.185")
end
#