Merge 51899933-Play-container to master

Glyn Normington · Glyn Normington · commit a5c0fb136eb8 · 2013-06-26T15:37:31.000+01:00
[#51899933]
diff --git a/resources/openjdk/diagnostics/killjava b/resources/openjdk/diagnostics/killjava
@@ -36,7 +36,7 @@ end
 
 begin
   Kill.log("#{__FILE__} attempting to kill Java processes",
-           `pkill -9 -a -l -f .*-XX:OnOutOfMemoryError=.*#{File.basename(__FILE__)}`)
+           `pkill -9 -f .*-XX:OnOutOfMemoryError=.*#{File.basename(__FILE__)}`)
 rescue => e
   Kill.log("#{__FILE__} failed with exception", "#{e.inspect}, #{e.backtrace}\n")
   abort e.message
