summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-01-11 22:37:38 +0000
committerChef Versioner <chef-versioner@chef.io>2017-01-11 22:37:38 +0000
commite420561a6b69ee795396418fe652f4f5743ad978 (patch)
tree8f7a79c689d728940ade40c81740d0dc86027019
parentb1dd5ba370670717070ce0b4a2a886069a2706b5 (diff)
downloadchef-e420561a6b69ee795396418fe652f4f5743ad978.tar.gz
Bump version of chef to 12.18.30 by Chef Versioner.v12.18.30
-rw-r--r--CHANGELOG.md8
-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, 14 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 620cf765c8..ee79bca52d 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.18.29](https://github.com/chef/chef/tree/v12.18.29) (2017-01-11)
-[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.29)
+## [v12.18.30](https://github.com/chef/chef/tree/v12.18.30) (2017-01-11)
+[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.30)
**Implemented enhancements:**
@@ -22,6 +22,10 @@ This changelog reflects the current state of chef's master branch on github and
- Fix Data Collector organization parsing regex [\#5630](https://github.com/chef/chef/pull/5630) ([adamleff](https://github.com/adamleff))
- Core: Use object ID when detected unprocessed Resources [\#5604](https://github.com/chef/chef/pull/5604) ([adamleff](https://github.com/adamleff))
+**Merged pull requests:**
+
+- Core: fix node attribute "unless" API methods [\#5717](https://github.com/chef/chef/pull/5717) ([lamont-granquist](https://github.com/lamont-granquist))
+
## [v12.17.44](https://github.com/chef/chef/tree/v12.17.44) (2016-12-07)
[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.44)
diff --git a/Gemfile.lock b/Gemfile.lock
index 56630fad43..9ae645c0e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.18.29)
+ chef (12.18.30)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.29)
+ chef-config (= 12.18.30)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,10 +76,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.18.29-universal-mingw32)
+ chef (12.18.30-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.29)
+ chef-config (= 12.18.30)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -120,7 +120,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.18.29)
+ chef-config (12.18.30)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 28a5fa299d..7f2b145f54 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.29 \ No newline at end of file
+12.18.30 \ 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 80f2e46863..5f266f9a72 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.18.29"
+ VERSION = "12.18.30"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 57da79ad6d..b2397f7c57 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.18.29"
+ VERSION = "12.18.30"
end
#