summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-21 16:37:18 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-21 16:37:18 +0000
commited8e467e421468865ac339ad2d87935f52843dda (patch)
treeb0c628e37a2fb5e950bae5b6dc77a0953b7118b9
parentc90b88617251ebf8b3629e176c4b85dbd143f94a (diff)
downloadchef-ed8e467e421468865ac339ad2d87935f52843dda.tar.gz
Bump version to 14.0.150 by Expeditorv14.0.150
-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 436b41819c..b22831bd99 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.149 -->
-## [v14.0.149](https://github.com/chef/chef/tree/v14.0.149) (2018-03-20)
+<!-- latest_release 14.0.150 -->
+## [v14.0.150](https://github.com/chef/chef/tree/v14.0.150) (2018-03-21)
#### Merged Pull Requests
-- memoize some work in the package class [#6661](https://github.com/chef/chef/pull/6661) ([lamont-granquist](https://github.com/lamont-granquist))
+- Pagefile sizes are in megabytes not bytes [#7019](https://github.com/chef/chef/pull/7019) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Pagefile sizes are in megabytes not bytes [#7019](https://github.com/chef/chef/pull/7019) ([tas50](https://github.com/tas50)) <!-- 14.0.150 -->
- memoize some work in the package class [#6661](https://github.com/chef/chef/pull/6661) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.149 -->
- Add missing installed logic for macos in build_essential [#7005](https://github.com/chef/chef/pull/7005) ([tas50](https://github.com/tas50)) <!-- 14.0.148 -->
- Add dmg_package, homebrew_cask, and homebrew_tap resources [#6963](https://github.com/chef/chef/pull/6963) ([tas50](https://github.com/tas50)) <!-- 14.0.147 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index abd78f7325..f46695f2f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.149)
+ chef (14.0.150)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.149)
+ chef-config (= 14.0.150)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.149-universal-mingw32)
+ chef (14.0.150-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.149)
+ chef-config (= 14.0.150)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.149)
+ chef-config (14.0.150)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 29683ecadd..80954f3948 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.149 \ No newline at end of file
+14.0.150 \ 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 3ff4aa9c89..7f57416e53 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.149"
+ VERSION = "14.0.150"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 101934769b..b5b2e8ebc8 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.149")
+ VERSION = Chef::VersionString.new("14.0.150")
end
#