summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-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, 11 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fc28f3f27..16426e1b8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
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).
-## [v12.19.33](https://github.com/chef/chef/tree/v12.19.33) (2017-02-16)
-[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.33)
+## [v12.19.34](https://github.com/chef/chef/tree/v12.19.34) (2017-02-17)
+[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.34)
**Merged pull requests:**
@@ -1360,4 +1360,4 @@ of partial templates.
* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
* Windows package type should be a symbol (Fixes #1997)
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index bdb9ce29e1..66bda5446b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,10 +46,10 @@ GIT
PATH
remote: .
specs:
- chef (12.19.33)
+ chef (12.19.34)
addressable
bundler (>= 1.10)
- chef-config (= 12.19.33)
+ chef-config (= 12.19.34)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -75,10 +75,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.19.33-universal-mingw32)
+ chef (12.19.34-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.19.33)
+ chef-config (= 12.19.34)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -119,7 +119,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.19.33)
+ chef-config (12.19.34)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 343d768725..ab4b900192 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.19.33 \ No newline at end of file
+12.19.34 \ 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 0610cc3100..e2caf3ab14 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 = "12.19.33"
+ VERSION = "12.19.34"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9ca321b634..990f91a38f 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.19.33"
+ VERSION = "12.19.34"
end
#