Skip to content

Commit

Permalink
Add CHANGELOG entry for #169 and workaround note in recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
bflad committed Jun 24, 2014
1 parent 2b10d50 commit 0162495
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions recipes/cgroups.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0162495

Please sign in to comment.