Merge branch 'stable-3.1'

Marius Burkard · Marius Burkard · commit c74c6544590c · 2016-02-20T09:58:51.000+01:00
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
@@ -286,7 +286,7 @@
 				ProcessLifeTime 3600
 				# MaxProcessCount 1000
 				DefaultMinClassProcessCount 0
-				DefaultMaxClassProcessCount 100
+				DefaultMaxClassProcessCount 10
 				IPCConnectTimeout 3
 				IPCCommTimeout 600
 				BusyTimeout 3600
