From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 4 Jul 2010 20:20:27 +0000 (+0200)
Subject: Merge remote branch 'twerner/msfl' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0216544ee8c5aca451b9133f908adb686cd8f68d;hp=-c;p=dak.git

Merge remote branch 'twerner/msfl' into merge

* twerner/msfl:
  introduce defaultThreadCount
  add key Common::ThreadCount to dak.conf

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

0216544ee8c5aca451b9133f908adb686cd8f68d
diff --combined config/debian/dak.conf
index 0f8e3fe2,2eaccd76..16120d8e
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -494,7 -494,7 +494,7 @@@ D
  {
    Name "projectb";
    Host "";
 -  Port -1;
 +  Port 5433;
  };
  
  Architectures
@@@ -653,3 -653,9 +653,9 @@@ Content
    Header "contents";
    Root "/srv/ftp-master.debian.org/test/";
  }
+ 
+ Common
+ {
+   // The default number of threads for multithreading parts of dak:
+   ThreadCount 16;
+ }