summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-26 11:19:16 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-26 11:19:16 +0000
commitb7993c7b40538307acc8d221279bde0c05bbaa3a (patch)
treedba8861e7b492e5d29841976ccab693cec324c4d
parent1cd50fc1caa35286ca405a5049a8ea1a98401d7e (diff)
downloadchef-b7993c7b40538307acc8d221279bde0c05bbaa3a.tar.gz
Bump version to 14.0.30 by Expeditorv14.0.30
-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 0f8121aa29..54263a3719 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.29 -->
-## [v14.0.29](https://github.com/chef/chef/tree/v14.0.29) (2018-01-25)
+<!-- latest_release 14.0.30 -->
+## [v14.0.30](https://github.com/chef/chef/tree/v14.0.30) (2018-01-26)
#### Merged Pull Requests
-- fix node assignment of ImmutableArrays to VividMashes/AttrArrays [#6790](https://github.com/chef/chef/pull/6790) ([lamont-granquist](https://github.com/lamont-granquist))
+- use a relative link so that docker does not drop our ca bundle link [#6796](https://github.com/chef/chef/pull/6796) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- use a relative link so that docker does not drop our ca bundle link [#6796](https://github.com/chef/chef/pull/6796) ([thommay](https://github.com/thommay)) <!-- 14.0.30 -->
- fix node assignment of ImmutableArrays to VividMashes/AttrArrays [#6790](https://github.com/chef/chef/pull/6790) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.29 -->
- allow uninstall of bundler to fail [#6789](https://github.com/chef/chef/pull/6789) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.28 -->
- [MSYS-724] Chef::Util::Windows::LogonSession should allow having only the prescribed users permissions [#6687](https://github.com/chef/chef/pull/6687) ([NimishaS](https://github.com/NimishaS)) <!-- 14.0.27 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 49a9030788..fe82f61b8b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.29)
+ chef (14.0.30)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.29)
+ chef-config (= 14.0.30)
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.29-universal-mingw32)
+ chef (14.0.30-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.29)
+ chef-config (= 14.0.30)
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.29)
+ chef-config (14.0.30)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index f9680549d6..3e1043d1cd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.29 \ No newline at end of file
+14.0.30 \ 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 52f1b7856d..6d83ea12e1 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.29"
+ VERSION = "14.0.30"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8d8948e6f4..a11b5c1e63 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.29")
+ VERSION = Chef::VersionString.new("14.0.30")
end
#