summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf70bf07cd..79bcea4fa5 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.93 -->
-## [v14.0.93](https://github.com/chef/chef/tree/v14.0.93) (2018-02-28)
+<!-- latest_release 14.0.95 -->
+## [v14.0.95](https://github.com/chef/chef/tree/v14.0.95) (2018-02-28)
#### Merged Pull Requests
-- fix for master of chefstyle [#6919](https://github.com/chef/chef/pull/6919) ([lamont-granquist](https://github.com/lamont-granquist))
+- fixing red omnibus builds [#6921](https://github.com/chef/chef/pull/6921) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- fixing red omnibus builds [#6921](https://github.com/chef/chef/pull/6921) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.95 -->
- fix for master of chefstyle [#6919](https://github.com/chef/chef/pull/6919) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.93 -->
- Stop mixlib-cli default clobbering mixlib-config settings [#6916](https://github.com/chef/chef/pull/6916) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.92 -->
- Raise fatal error If FQDN duplicated [#6781](https://github.com/chef/chef/pull/6781) ([linyows](https://github.com/linyows)) <!-- 14.0.91 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a970e0e873..6488848f88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 8cdfbfe462ef0850333095f31a6ef1a23dda6b73
+ revision: a7a9e6f59f4fe9a78af095e28717679422a5a631
branch: master
specs:
- ohai (14.0.18)
+ ohai (14.0.19)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.94)
+ chef (14.0.95)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.94)
+ chef-config (= 14.0.95)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.94-universal-mingw32)
+ chef (14.0.95-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.94)
+ chef-config (= 14.0.95)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.94)
+ chef-config (14.0.95)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 8d84118509..8f5ae048ab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.94 \ No newline at end of file
+14.0.95 \ 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 582e8dec95..4618533d40 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.94"
+ VERSION = "14.0.95"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8c6314cc36..977e68724e 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.94")
+ VERSION = Chef::VersionString.new("14.0.95")
end
#