summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/monkey_patches.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-07-27 10:17:44 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-07-27 10:17:44 -0700
commitb53e7d78e2e87571ae53170e9716b9ccd75da6e2 (patch)
tree58489a37bd0ee14b3d053a0e23f9638b4f6205e7 /lib/puppet/util/monkey_patches.rb
parent94edd404130b4236f0c65a579857e3a25c5ee17f (diff)
parentecf44e4408c168893d74af58a4c7c8606634a844 (diff)
downloadpuppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.tar.gz
puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.tar.xz
puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.zip
Merge commit '2.6.1rc1' into next
Diffstat (limited to 'lib/puppet/util/monkey_patches.rb')
-rw-r--r--lib/puppet/util/monkey_patches.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb
index e035afd9f..9664ff310 100644
--- a/lib/puppet/util/monkey_patches.rb
+++ b/lib/puppet/util/monkey_patches.rb
@@ -1,4 +1,7 @@
-Process.maxgroups = 1024
+
+unless defined? JRUBY_VERSION
+ Process.maxgroups = 1024
+end
module RDoc
def self.caller(skip=nil)