summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2016-12-16 16:11:49 +0000
committerChef Versioner <chef-versioner@chef.io>2016-12-16 16:11:49 +0000
commita70905ea932e1a5678c910c8495a344b3b0930e0 (patch)
treef83e19b2a5f2dd237ef0f9e7d61ce2b2b6a7f5ee
parenta2d18fb555694f5c6c9a62206a2051f352093eb6 (diff)
downloadchef-bp-423/stunnel-in-rhel.tar.gz
Bump version of chef to 12.18.3 by Chef Versioner.v12.18.3bp-423/stunnel-in-rhel
-rw-r--r--CHANGELOG.md5
-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, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9af4fc294d..f4ebabc8be 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.2](https://github.com/chef/chef/tree/v12.18.2) (2016-12-14)
-[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.2)
+## [v12.18.3](https://github.com/chef/chef/tree/v12.18.3) (2016-12-16)
+[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.3)
**Implemented enhancements:**
@@ -12,6 +12,7 @@ This changelog reflects the current state of chef's master branch on github and
**Fixed bugs:**
+- 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))
## [v12.17.44](https://github.com/chef/chef/tree/v12.17.44) (2016-12-07)
diff --git a/Gemfile.lock b/Gemfile.lock
index ae4b1f6189..465a3d6c5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.18.2)
+ chef (12.18.3)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.2)
+ chef-config (= 12.18.3)
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.2-universal-mingw32)
+ chef (12.18.3-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.2)
+ chef-config (= 12.18.3)
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.2)
+ chef-config (12.18.3)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index d2d8914869..4150e8a615 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.2 \ No newline at end of file
+12.18.3 \ 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 2376a81f55..8588aae82c 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.2"
+ VERSION = "12.18.3"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 7621ff0591..77bdd8dddf 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.2"
+ VERSION = "12.18.3"
end
#