diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-08-25 09:56:18 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-08-25 09:56:18 -0700 |
| commit | 16c56e408366e4af6bd469442342ecf597c5d9d9 (patch) | |
| tree | c88a6c23091e492d520027ddf9ad6b89953873c4 | |
| parent | f4fa7f0bca0b559811867633d7762986a4dd4811 (diff) | |
| parent | 2d2df8c1a51091a727382234bc1f16d9302783a1 (diff) | |
| download | chef-16c56e408366e4af6bd469442342ecf597c5d9d9.tar.gz | |
Merge pull request #3817 from chef/lcg/remove-gc
remove now-useless GC
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | lib/chef/client.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3afcbee8a8..1e4c2d5f9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,9 @@ * [**Nate Walck**](https://github.com/natewalck): [pr#3704](https://github.com/chef/chef/pull/3704): Add SIP (OS X 10.11) support * [**Phil Dibowitz**](https://github.com/jaymzh): - [pr#3805](https://github.com/chef/chef/pull/3805): LWRP parameter validators should use truthiness + +* [pr#3817](https://github.com/chef/chef/pull/3817) Remove now-useless forcing of ruby Garbage Collector run +* [pr#3805](https://github.com/chef/chef/pull/3805) LWRP parameter validators should use truthiness * [pr#3774](https://github.com/chef/chef/pull/3774) Add support for yum-deprecated in yum provider * [pr#3793](https://github.com/chef/chef/pull/3793) CHEF-5372: Support specific `run_levels` for RedHat service * [pr#2460](https://github.com/chef/chef/pull/2460) add privacy flag diff --git a/lib/chef/client.rb b/lib/chef/client.rb index 3c86f52b4a..621ce3d489 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -3,7 +3,7 @@ # Author:: Christopher Walters (<cw@opscode.com>) # Author:: Christopher Brown (<cb@opscode.com>) # Author:: Tim Hinderliter (<tim@opscode.com>) -# Copyright:: Copyright (c) 2008-2011 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -302,7 +302,6 @@ class Chef @run_status = nil run_context = nil runlock.release - GC.start end # Raise audit, converge, and other errors here so that we exit |