summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-22 18:00:06 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-22 18:00:06 +0000
commita000cfe6b47df55333a9f41dccbe4c4302db845a (patch)
tree6ec36a8e7b1d6f23d6e14d2412af90ca5a636354
parenta536a54dfa029c657bcfd25c8d47e20a5983f458 (diff)
downloadchef-a000cfe6b47df55333a9f41dccbe4c4302db845a.tar.gz
Bump version to 14.0.75 by Expeditorv14.0.75
-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 c9b5b9896b..b83d5f35d9 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.74 -->
-## [v14.0.74](https://github.com/chef/chef/tree/v14.0.74) (2018-02-22)
+<!-- latest_release 14.0.75 -->
+## [v14.0.75](https://github.com/chef/chef/tree/v14.0.75) (2018-02-22)
#### Merged Pull Requests
-- Allow tarballs generated by chef export to be used [#6871](https://github.com/chef/chef/pull/6871) ([thommay](https://github.com/thommay))
+- Add new introduced and description resource properties to many resources [#6854](https://github.com/chef/chef/pull/6854) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Add new introduced and description resource properties to many resources [#6854](https://github.com/chef/chef/pull/6854) ([tas50](https://github.com/tas50)) <!-- 14.0.75 -->
- Allow tarballs generated by chef export to be used [#6871](https://github.com/chef/chef/pull/6871) ([thommay](https://github.com/thommay)) <!-- 14.0.74 -->
- Update libxml2 to 2.9.7 [#6885](https://github.com/chef/chef/pull/6885) ([tas50](https://github.com/tas50)) <!-- 14.0.72 -->
- Disable sudo on unit tests [#6879](https://github.com/chef/chef/pull/6879) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.71 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 10736cf161..571314c4d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.74)
+ chef (14.0.75)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.74)
+ chef-config (= 14.0.75)
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.74-universal-mingw32)
+ chef (14.0.75-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.74)
+ chef-config (= 14.0.75)
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.74)
+ chef-config (14.0.75)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index d0d23c12b9..b8d9cdbff7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.74 \ No newline at end of file
+14.0.75 \ 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 39a5a73ae9..bd15301f0a 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.74"
+ VERSION = "14.0.75"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2cc8f903b4..95c257245b 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.74")
+ VERSION = Chef::VersionString.new("14.0.75")
end
#