summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-30 11:08:02 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-30 11:08:02 +0000
commit3f768e7befa20d726ef7e643d87837810cf6c075 (patch)
treed80b486566b58541e9839e3014912687ea80ebe9
parenta59028e1e4f9fe0d994dbcb8050f557b2bfdbd6b (diff)
downloadchef-3f768e7befa20d726ef7e643d87837810cf6c075.tar.gz
Bump version to 14.0.41 by Expeditorv14.0.41
-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 97dfa1f35d..2d276f88a4 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.40 -->
-## [v14.0.40](https://github.com/chef/chef/tree/v14.0.40) (2018-01-30)
+<!-- latest_release 14.0.41 -->
+## [v14.0.41](https://github.com/chef/chef/tree/v14.0.41) (2018-01-30)
#### Merged Pull Requests
-- Fix Appveyor testing: the format of this flametest doesn&#39;t matter [#6808](https://github.com/chef/chef/pull/6808) ([lamont-granquist](https://github.com/lamont-granquist))
+- Remove the spec for epic_fail [#6809](https://github.com/chef/chef/pull/6809) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Remove the spec for epic_fail [#6809](https://github.com/chef/chef/pull/6809) ([tas50](https://github.com/tas50)) <!-- 14.0.41 -->
- Fix Appveyor testing: the format of this flametest doesn&#39;t matter [#6808](https://github.com/chef/chef/pull/6808) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.40 -->
- Ensure package (un)locking is idempotent [#6494](https://github.com/chef/chef/pull/6494) ([Rarian](https://github.com/Rarian)) <!-- 14.0.39 -->
- use a stricter comparison so knife ssh only fails if --exit-on-error [#6582](https://github.com/chef/chef/pull/6582) ([sarkis](https://github.com/sarkis)) <!-- 14.0.38 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7c72fccad1..5464d08221 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 81983d49b60a3de310aef8a09a57dac8d690bc36
+ revision: d94628d68580709a58fdb742e171ccca1b0fb2a4
branch: master
specs:
ohai (14.0.1)
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.40)
+ chef (14.0.41)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.40)
+ chef-config (= 14.0.41)
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.40-universal-mingw32)
+ chef (14.0.41-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.40)
+ chef-config (= 14.0.41)
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.40)
+ chef-config (14.0.41)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -282,7 +282,7 @@ GEM
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
- rspec-support (3.7.0)
+ rspec-support (3.7.1)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
diff --git a/VERSION b/VERSION
index 67b0ecf499..c5a34759e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.40 \ No newline at end of file
+14.0.41 \ 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 aae6c28a45..1bef22836a 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.40"
+ VERSION = "14.0.41"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ec8a8e1841..d000edebea 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.40")
+ VERSION = Chef::VersionString.new("14.0.41")
end
#