From 0162495dcdfb16993f3a855f06763ba3912df151 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Mon, 23 Jun 2014 23:16:09 -0400 Subject: [PATCH] Add CHANGELOG entry for #169 and workaround note in recipe --- CHANGELOG.md | 2 ++ recipes/cgroups.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 801efaf3fb..7aed1ad4ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ Other awesome work merged: * [#164][]: Bugfix: Removing a container should also remove its cidfile * [#166][]: Bugfix: Fix docker_inspect_id for Docker 1.0+ * [#158][]/[#160][]/[#165][]: Bugfix: Fix NameError when displaying error messages for timed-out commands +* [#169][]: Bugfix: Specify Upstart as service provider for cgroup on Ubuntu 14.04 (workaround for CHEF-5276, fixed in Chef 11.14) * [#137][]/[#138][]: Enhancement: Experimental Ubuntu 14.04 LTS support * [#144][]: Enhancement: Experimental Amazon linux support * [#150][]/[#152][]: Enhancement: Add net attribute, deprecate networking @@ -526,5 +527,6 @@ Lots of community contributions this release -- thanks! [#165]: https://github.com/bflad/chef-docker/issues/165 [#166]: https://github.com/bflad/chef-docker/issues/166 [#168]: https://github.com/bflad/chef-docker/issues/168 +[#169]: https://github.com/bflad/chef-docker/issues/169 [@jcrobak]: https://github.com/jcrobak [@wingrunr21]: https://github.com/wingrunr21 diff --git a/recipes/cgroups.rb b/recipes/cgroups.rb index a8cb037507..5656fd7b2d 100644 --- a/recipes/cgroups.rb +++ b/recipes/cgroups.rb @@ -22,6 +22,7 @@ else service 'cgroup-lite' do action :start + # WORKAROUND: CHEF-5276, fixed in Chef 11.14 provider Chef::Provider::Service::Upstart if node['platform_version'] == '14.04' end end