summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-20 16:12:06 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-20 16:12:06 +0000
commit51c59ecb887e9122aa849d8153b9984df74b2b09 (patch)
tree14c2af611b62c7f88ab0c40861926e7a6285ccdb
parentf6d02cb09b32bfd99d3a3b3ba2955a609bb5c209 (diff)
downloadchef-51c59ecb887e9122aa849d8153b9984df74b2b09.tar.gz
Bump version to 14.0.146 by Expeditorv14.0.146
-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 27cb03b330..faa2ef50f1 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.145 -->
-## [v14.0.145](https://github.com/chef/chef/tree/v14.0.145) (2018-03-20)
+<!-- latest_release 14.0.146 -->
+## [v14.0.146](https://github.com/chef/chef/tree/v14.0.146) (2018-03-20)
#### Merged Pull Requests
-- Fail with a warning if users specify apt/yum/zypper repos with slashes [#7000](https://github.com/chef/chef/pull/7000) ([tas50](https://github.com/tas50))
+- Remove Chef 12-isms from the apt_repository resource [#6998](https://github.com/chef/chef/pull/6998) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Remove Chef 12-isms from the apt_repository resource [#6998](https://github.com/chef/chef/pull/6998) ([tas50](https://github.com/tas50)) <!-- 14.0.146 -->
- Fail with a warning if users specify apt/yum/zypper repos with slashes [#7000](https://github.com/chef/chef/pull/7000) ([tas50](https://github.com/tas50)) <!-- 14.0.145 -->
- Detect new &quot;automatically&quot; installed string in Zypper [#7009](https://github.com/chef/chef/pull/7009) ([tas50](https://github.com/tas50)) <!-- 14.0.144 -->
- Lazy eval empty Hash/Array resource properties. [#6997](https://github.com/chef/chef/pull/6997) ([tas50](https://github.com/tas50)) <!-- 14.0.142 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 4315d0307c..66ea828540 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.145)
+ chef (14.0.146)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.145)
+ chef-config (= 14.0.146)
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.145-universal-mingw32)
+ chef (14.0.146-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.145)
+ chef-config (= 14.0.146)
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.145)
+ chef-config (14.0.146)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index c7214f41af..e1c45897a6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.145 \ No newline at end of file
+14.0.146 \ 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 eb4b918a97..30b88c8eea 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.145"
+ VERSION = "14.0.146"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f6acf16a23..eabdf91d55 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.145")
+ VERSION = Chef::VersionString.new("14.0.146")
end
#