From: Jeff McCune Date: Thu, 25 Oct 2012 17:57:45 +0000 (-0700) Subject: Merge branch 'maint/2.5.x/pick_explicitly_load_functions' into maint/2.5.x/pick_compa... X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c2573298a5a58ca902d1d04ca2f91dd85bef6581;p=puppet-stdlib.git Merge branch 'maint/2.5.x/pick_explicitly_load_functions' into maint/2.5.x/pick_compatible_new_functionality * maint/2.5.x/pick_explicitly_load_functions: Explicitly load functions used by ensure_resource --- c2573298a5a58ca902d1d04ca2f91dd85bef6581