From: root <root@blitz.inria.fr>
Date: Fri, 1 Apr 2011 20:58:20 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: nodemanager-2.0-32~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cdc2396b04e5de401e75a57b27ed963a2f2663a4;hp=587e5a30120fef8a5065d5bdf8655c5042fb48f3;p=nodemanager.git

Merge commit 'origin/master'
---

diff --git a/logrotate/nodemanager b/logrotate/nodemanager
index 0ff3627..8fd2d3f 100644
--- a/logrotate/nodemanager
+++ b/logrotate/nodemanager
@@ -6,3 +6,10 @@
     rotate 5
     missingok
 }
+/var/log/nodemanager.daemon {
+    copytruncate
+    compress
+    weekly
+    rotate 5
+    missingok
+}