summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-05-29 15:18:38 -0600
committerJames Moger <james.moger@gitblit.com>2014-05-29 15:18:38 -0600
commite1bcda8c6245035c96bf44ee09d61fa5a52bcafc (patch)
treeaac5beb007c59f0ea63d45bc94c6c005e35f9668
parent7ef376e794cd6b593d47a86620ac343e97fe01bc (diff)
parent9eff8aa74221277d878c174840e4cefdc9e954d8 (diff)
downloadgitblit-e1bcda8c6245035c96bf44ee09d61fa5a52bcafc.tar.gz
gitblit-e1bcda8c6245035c96bf44ee09d61fa5a52bcafc.zip
Merged #93 "Clarify server.threadPoolSize setting documentation"
-rw-r--r--src/main/distrib/data/gitblit.properties7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index b27395c3..6f55a3eb 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -1795,7 +1795,8 @@ realm.ldap.removeDeletedUsers = true
realm.redmine.url = http://example.com/redmine
#
-# Server Settings
+# Gitblit GO Server Settings
+# The following settings only affect the integrated GO variant.
#
# The temporary folder to decompress the embedded gitblit webapp.
@@ -1805,7 +1806,9 @@ realm.redmine.url = http://example.com/redmine
# BASEFOLDER
server.tempFolder = ${baseFolder}/temp
-# Specify the maximum number of concurrent http/https worker threads to allow.
+# Specify the maximum number of concurrent http/https Jetty worker
+# threads to allow. This setting does not affect other threaded
+# daemons and components of Gitblit.
#
# SINCE 1.3.0
# RESTART REQUIRED