summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-16 16:02:17 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-16 16:02:17 +0000
commit4f54c7b443f55a0c2dcfaf4d193aaa037a35009d (patch)
tree5193899238713169981869c86feef2b323430cee
parentbf1b6dc92c5314a22e3d5a30198beb5665166c23 (diff)
downloadchef-4f54c7b443f55a0c2dcfaf4d193aaa037a35009d.tar.gz
Bump version to 12.22.2 by Expeditorv12.22.2
-rw-r--r--CHANGELOG.md12
-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, 18 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13755ed443..4ee92a9e3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 12.22.2 -->
+## [v12.22.2](https://github.com/chef/chef/tree/v12.22.2) (2018-03-16)
+
+#### Merged Pull Requests
+- Pass pointer to LsaFreeMemory, not FFI::MemoryPointer [#6992](https://github.com/chef/chef/pull/6992) ([btm](https://github.com/btm))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=12.22.1 -->
+### Changes since 12.22.1 release
+
+#### Merged Pull Requests
+- Pass pointer to LsaFreeMemory, not FFI::MemoryPointer [#6992](https://github.com/chef/chef/pull/6992) ([btm](https://github.com/btm)) <!-- 12.22.2 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0df66553d5..f9b43d57fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,10 @@ GIT
PATH
remote: .
specs:
- chef (12.22.1)
+ chef (12.22.2)
addressable
bundler (>= 1.10)
- chef-config (= 12.22.1)
+ chef-config (= 12.22.2)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -67,10 +67,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.22.1-universal-mingw32)
+ chef (12.22.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.22.1)
+ chef-config (= 12.22.2)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -111,7 +111,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.22.1)
+ chef-config (12.22.2)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 5a7da551a8..e924f5b456 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.22.1 \ No newline at end of file
+12.22.2 \ 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 aab78ea79c..55148f99a0 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.22.1"
+ VERSION = "12.22.2"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9cd3dbd5a0..b165857373 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.22.1"
+ VERSION = "12.22.2"
end
#