summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-08 16:48:23 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-08 16:48:23 +0000
commit8a361fbc44402e38b9eac6815c09456211ee0966 (patch)
treecd9e9ee041eaa8db5abe3489651862d1e5bc07d0
parent667183f262e5f85ee38ddf652012236d13c5a639 (diff)
downloadchef-14.0.48.tar.gz
Bump version to 14.0.48 by Expeditorv14.0.48
-rw-r--r--CHANGELOG.md8
-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, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf1f108fc3..82962a8be9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.47 -->
-## [v14.0.47](https://github.com/chef/chef/tree/v14.0.47) (2018-02-07)
+<!-- latest_release 14.0.48 -->
+## [v14.0.48](https://github.com/chef/chef/tree/v14.0.48) (2018-02-08)
#### Merged Pull Requests
-- Link to the knife docs when the knife config file is missing [#6364](https://github.com/chef/chef/pull/6364) ([tas50](https://github.com/tas50))
-- Grammar fixes in windows_task [#6828](https://github.com/chef/chef/pull/6828) ([Happycoil](https://github.com/Happycoil))
+- Don&#39;t rely on the Passwd Ohai plugin in resources [#6833](https://github.com/chef/chef/pull/6833) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Don&#39;t rely on the Passwd Ohai plugin in resources [#6833](https://github.com/chef/chef/pull/6833) ([thommay](https://github.com/thommay)) <!-- 14.0.48 -->
- Link to the knife docs when the knife config file is missing [#6364](https://github.com/chef/chef/pull/6364) ([tas50](https://github.com/tas50)) <!-- 14.0.47 -->
- Grammar fixes in windows_task [#6828](https://github.com/chef/chef/pull/6828) ([Happycoil](https://github.com/Happycoil)) <!-- 14.0.46 -->
- Fix windows_task idle_time validation [#6807](https://github.com/chef/chef/pull/6807) ([algaut](https://github.com/algaut)) <!-- 14.0.46 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a17323edab..afb309564f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.47)
+ chef (14.0.48)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.47)
+ chef-config (= 14.0.48)
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.47-universal-mingw32)
+ chef (14.0.48-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.47)
+ chef-config (= 14.0.48)
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.47)
+ chef-config (14.0.48)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index fbe1dfb2c3..0b3cf20ec6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.47 \ No newline at end of file
+14.0.48 \ 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 f2e5603864..c96737d40b 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.47"
+ VERSION = "14.0.48"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 96565f6a0f..bfbf8c6ded 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.47")
+ VERSION = Chef::VersionString.new("14.0.48")
end
#