summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-01 00:15:54 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-01 00:15:54 +0000
commite460f5f8496a19e86616cb756e3cbf71e9f9d918 (patch)
treea6489ab8b0e1f2d52cd6db591304fb9911cabd6e
parent23d9aa1b08df44db32141fe4e4ad3e51b9580beb (diff)
downloadchef-e460f5f8496a19e86616cb756e3cbf71e9f9d918.tar.gz
Bump version to 14.4.61 by Chef Expeditorv14.4.61
Obvious fix; these changes are the result of automation not creative thinking.
-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 af234138e8..7917522091 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.60 -->
-## [v14.4.60](https://github.com/chef/chef/tree/v14.4.60) (2018-08-30)
+<!-- latest_release 14.4.61 -->
+## [v14.4.61](https://github.com/chef/chef/tree/v14.4.61) (2018-09-01)
#### Merged Pull Requests
-- Build chef omnibus package with Chef 14 / Berkshelf 7 [#7603](https://github.com/chef/chef/pull/7603) ([tas50](https://github.com/tas50))
+- windows_auto_run: Avoid declare_resource where it&#39;s not needed [#7608](https://github.com/chef/chef/pull/7608) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- windows_auto_run: Avoid declare_resource where it&#39;s not needed [#7608](https://github.com/chef/chef/pull/7608) ([tas50](https://github.com/tas50)) <!-- 14.4.61 -->
- Build chef omnibus package with Chef 14 / Berkshelf 7 [#7603](https://github.com/chef/chef/pull/7603) ([tas50](https://github.com/tas50)) <!-- 14.4.60 -->
- Simplify the rake task to updating gem dependencies [#7602](https://github.com/chef/chef/pull/7602) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.4.59 -->
- Add additional property docs + update existing docs [#7600](https://github.com/chef/chef/pull/7600) ([tas50](https://github.com/tas50)) <!-- 14.4.58 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 03dc788e0d..df7c023e72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.60)
+ chef (14.4.61)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.60)
+ chef-config (= 14.4.61)
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.60-universal-mingw32)
+ chef (14.4.61-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.60)
+ chef-config (= 14.4.61)
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.60)
+ chef-config (14.4.61)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index c3b9f3829d..84214dc653 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.60 \ No newline at end of file
+14.4.61 \ 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 52af5d6f95..d2ed737075 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.60".freeze
+ VERSION = "14.4.61".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 53922c7361..5cb18f456e 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.60")
+ VERSION = Chef::VersionString.new("14.4.61")
end
#