summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-05-16 17:07:11 -0700
committerNick Lewis <nick@puppetlabs.com>2011-05-16 17:07:11 -0700
commit797da049bf8f90e110f27ecdd0f2aadd24392030 (patch)
treeb73bacca9859e063138e9a14bd08073995a9637c
parent8f58db9188359ab8c8988e56b1abf0ec3bbc1303 (diff)
parent3197e21069e797faadc8ee1716207a4cf98d6eee (diff)
downloadpuppet-797da049bf8f90e110f27ecdd0f2aadd24392030.tar.gz
puppet-797da049bf8f90e110f27ecdd0f2aadd24392030.tar.xz
puppet-797da049bf8f90e110f27ecdd0f2aadd24392030.zip
Merge branch 'ticket/2.7.x/7298' into 2.7.x
-rw-r--r--lib/puppet/util.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index d06f44808..ce9d4642b 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -1,5 +1,6 @@
# A module to collect utility functions.
+require 'English'
require 'puppet/util/monkey_patches'
require 'sync'
require 'puppet/external/lock'