summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-14 00:05:32 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-14 00:05:32 +0000
commit5fb14ff1adbd1700da1b14ced8ec8c00752f4299 (patch)
treeeb964e38a6b19a4a3c316982a6c80b6fcf29bd4d
parenta4c21a9b329f39d4736842e3bbed493856d2cb81 (diff)
downloadchef-5fb14ff1adbd1700da1b14ced8ec8c00752f4299.tar.gz
Bump version to 14.4.35 by Chef Expeditorv14.4.35
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db3cee58df..38e4e44dcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.34 -->
-## [v14.4.34](https://github.com/chef/chef/tree/v14.4.34) (2018-08-13)
+<!-- latest_release 14.4.35 -->
+## [v14.4.35](https://github.com/chef/chef/tree/v14.4.35) (2018-08-14)
#### Merged Pull Requests
-- windows_package: Fix package sensitive error [#7353](https://github.com/chef/chef/pull/7353) ([dheerajd-msys](https://github.com/dheerajd-msys))
+- Add cron_d and cron_access resources [#7253](https://github.com/chef/chef/pull/7253) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Add cron_d and cron_access resources [#7253](https://github.com/chef/chef/pull/7253) ([tas50](https://github.com/tas50)) <!-- 14.4.35 -->
- windows_package: Fix package sensitive error [#7353](https://github.com/chef/chef/pull/7353) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 14.4.34 -->
- Require mixlib-shellout 2.4 or later [#7543](https://github.com/chef/chef/pull/7543) ([tas50](https://github.com/tas50)) <!-- 14.4.33 -->
- Fix issue of setting comment for windows user [#7537](https://github.com/chef/chef/pull/7537) ([NAshwini](https://github.com/NAshwini)) <!-- 14.4.32 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f5ea7d70c..adc7996f83 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.34)
+ chef (14.4.35)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.34)
+ chef-config (= 14.4.35)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.4.34-universal-mingw32)
+ chef (14.4.35-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.34)
+ chef-config (= 14.4.35)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.4.34)
+ chef-config (14.4.35)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -145,7 +145,7 @@ GEM
net-http-persistent (~> 2.9)
net-http-pipeline
hashdiff (0.3.7)
- hashie (3.5.7)
+ hashie (3.6.0)
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
diff --git a/VERSION b/VERSION
index 6f28cf696d..2f739508fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.34 \ No newline at end of file
+14.4.35 \ 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 3cd87681f8..1fb2f47c6c 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.4.34".freeze
+ VERSION = "14.4.35".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 574412ec3b..6929609458 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.4.34")
+ VERSION = Chef::VersionString.new("14.4.35")
end
#