summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md16
-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, 15 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc6d9735c0..07dc7fd07b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,18 @@
This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
-## [v13.0.66](https://github.com/chef/chef/tree/v13.0.66) (2017-03-27)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.66...v13.0.66)
-
-**Closed issues:**
-
-- powershell\_out stdout contains '\r\n' at the end of the output [\#5947](https://github.com/chef/chef/issues/5947)
+## [v13.0.67](https://github.com/chef/chef/tree/v13.0.67) (2017-03-28)
+[Full Changelog](https://github.com/chef/chef/compare/v13.0.67...v13.0.67)
**Merged pull requests:**
-- Make ResourceReporter smarter to get resource identity and state [\#5941](https://github.com/chef/chef/pull/5941) ([afiune](https://github.com/afiune))
+- Fix action class weirdness in Chef-13 [\#5946](https://github.com/chef/chef/pull/5946) ([lamont-granquist](https://github.com/lamont-granquist))
-## [v13.0.66](https://github.com/chef/chef/tree/v13.0.66) (2017-03-27)
-[Full Changelog](https://github.com/chef/chef/compare/v12.19.36...v13.0.66)
+## [v13.0.67](https://github.com/chef/chef/tree/v13.0.67) (2017-03-27)
+[Full Changelog](https://github.com/chef/chef/compare/v12.19.36...v13.0.67)
**Closed issues:**
+- powershell\_out stdout contains '\r\n' at the end of the output [\#5947](https://github.com/chef/chef/issues/5947)
- `group` resource not idempotent on Windows \(12.19.36\) [\#5857](https://github.com/chef/chef/issues/5857)
- Chef doesn't have access to a file created by itself, under the ownership of SYSTEM? [\#5844](https://github.com/chef/chef/issues/5844)
- apt\_repository can't identify key fingerprints when gnupg 2.1.x is used [\#5831](https://github.com/chef/chef/issues/5831)
@@ -24,6 +21,7 @@ This changelog reflects the current state of chef's master branch on github and
**Merged pull requests:**
+- Make ResourceReporter smarter to get resource identity and state [\#5941](https://github.com/chef/chef/pull/5941) ([afiune](https://github.com/afiune))
- Chef-13: Simplify DSL creation [\#5934](https://github.com/chef/chef/pull/5934) ([lamont-granquist](https://github.com/lamont-granquist))
- Chef-13: Remove deprecated Chef::Client attrs [\#5932](https://github.com/chef/chef/pull/5932) ([lamont-granquist](https://github.com/lamont-granquist))
- Chef-13: remove method\_missing from the DSL [\#5930](https://github.com/chef/chef/pull/5930) ([lamont-granquist](https://github.com/lamont-granquist))
diff --git a/Gemfile.lock b/Gemfile.lock
index 293dd61eb6..7f689647e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,10 +113,10 @@ GIT
PATH
remote: .
specs:
- chef (13.0.67)
+ chef (13.0.68)
addressable
bundler (>= 1.10)
- chef-config (= 13.0.67)
+ chef-config (= 13.0.68)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -142,10 +142,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.0.67-universal-mingw32)
+ chef (13.0.68-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.0.67)
+ chef-config (= 13.0.68)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -186,7 +186,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.0.67)
+ chef-config (13.0.68)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 91097adae2..5bc3c75251 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.67 \ No newline at end of file
+13.0.68 \ 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 657a9a1226..e71c6f80af 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 = "13.0.67"
+ VERSION = "13.0.68"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6d1967957e..de3423b410 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.0.67"
+ VERSION = "13.0.68"
end
#