summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-15 19:26:55 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-15 19:26:55 +0000
commit515e2a4b04521a1a9f49b9681680507e410101b0 (patch)
treec0db79143e1f2febca6f0d96d7a084aa5e708831
parentf6578f1ef5ac5d18f8d0956bce46858e373b5971 (diff)
downloadchef-13.3.46.tar.gz
Bump version to 13.3.46 by Chef Expeditorv13.3.46
-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 d60dc6357f..75934a4d27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,15 @@
-<!-- latest_release 13.3.45 -->
-## [v13.3.45](https://github.com/chef/chef/tree/v13.3.45) (2017-08-14)
+<!-- latest_release 13.3.46 -->
+## [v13.3.46](https://github.com/chef/chef/tree/v13.3.46) (2017-08-15)
#### Merged Pull Requests
-- Catch Chef 12 changelog up to current 12 release [#6327](https://github.com/chef/chef/pull/6327) ([tas50](https://github.com/tas50))
+- Ignore validation errors in Resource#to_text [#6331](https://github.com/chef/chef/pull/6331) ([coderanger](https://github.com/coderanger))
<!-- latest_release -->
<!-- release_rollup since=13.2.20 -->
### Changes since 13.2.20 release
#### Merged Pull Requests
+- Ignore validation errors in Resource#to_text [#6331](https://github.com/chef/chef/pull/6331) ([coderanger](https://github.com/coderanger)) <!-- 13.3.46 -->
- Catch Chef 12 changelog up to current 12 release [#6327](https://github.com/chef/chef/pull/6327) ([tas50](https://github.com/tas50)) <!-- 13.3.45 -->
- Fix bad examples in the release notes [#6326](https://github.com/chef/chef/pull/6326) ([tas50](https://github.com/tas50)) <!-- 13.3.44 -->
- Add more items to the 13.3 release notes [#6325](https://github.com/chef/chef/pull/6325) ([tas50](https://github.com/tas50)) <!-- 13.3.43 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 67d52acc6e..bb456f69d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.45)
+ chef (13.3.46)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.45)
+ chef-config (= 13.3.46)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.3.45-universal-mingw32)
+ chef (13.3.46-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.45)
+ chef-config (= 13.3.46)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.3.45)
+ chef-config (13.3.46)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 555e0ada9d..cd774741a8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.45 \ No newline at end of file
+13.3.46 \ 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 d817231b7b..5fd2149b35 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -20,7 +20,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.3.45"
+ VERSION = "13.3.46"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 133aced760..1d30b97614 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -22,7 +22,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.3.45")
+ VERSION = Chef::VersionString.new("13.3.46")
end
#