summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-01 23:00:33 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-01 23:00:33 +0000
commitf69e31ce7dff292a01e600dd2ad229a68a40ef95 (patch)
tree2039b05c9769e281f5698c9250c2c0647272a02b
parent8c1c190550be4df58377ed051d2442c789693616 (diff)
downloadchef-f69e31ce7dff292a01e600dd2ad229a68a40ef95.tar.gz
Bump version to 14.0.101 by Expeditorv14.0.101
-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 162052558b..a40cf58a75 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.100 -->
-## [v14.0.100](https://github.com/chef/chef/tree/v14.0.100) (2018-03-01)
+<!-- latest_release 14.0.101 -->
+## [v14.0.101](https://github.com/chef/chef/tree/v14.0.101) (2018-03-01)
#### Merged Pull Requests
-- Remove the :uninstall action from chocolatey_package - CHEF-21 [#6920](https://github.com/chef/chef/pull/6920) ([tas50](https://github.com/tas50))
+- use appbundler 0.11.1 for omnibus builds [#6930](https://github.com/chef/chef/pull/6930) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- use appbundler 0.11.1 for omnibus builds [#6930](https://github.com/chef/chef/pull/6930) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.101 -->
- Remove the :uninstall action from chocolatey_package - CHEF-21 [#6920](https://github.com/chef/chef/pull/6920) ([tas50](https://github.com/tas50)) <!-- 14.0.100 -->
- this really needs to be turned into a yml file... [#6926](https://github.com/chef/chef/pull/6926) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.99 -->
- Remove git ref on bundler-audit [#6925](https://github.com/chef/chef/pull/6925) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.98 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5bf8989edd..019bd0a3dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.100)
+ chef (14.0.101)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.100)
+ chef-config (= 14.0.101)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.100-universal-mingw32)
+ chef (14.0.101-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.100)
+ chef-config (= 14.0.101)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -102,7 +102,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.100)
+ chef-config (14.0.101)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 6d81f54f29..480bb6aae3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.100 \ No newline at end of file
+14.0.101 \ 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 28aefcf784..7c75558c0e 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.100"
+ VERSION = "14.0.101"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3c5d10bc76..1217ba75ec 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.100")
+ VERSION = Chef::VersionString.new("14.0.101")
end
#