sup

commit 6a2730628825be024f852f2808b37ad2a8f1068f
parent efedd495db72618aa9af9a576963abbbf69aaf97
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Tue, 28 Jul 2009 11:24:20 -0400

Merge branch 'master' into next

Conflicts:
	lib/sup/index.rb

Diffstat:

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/sup/ferret_index.rb b/lib/sup/ferret_index.rb
@@ -240,10 +240,10 @@ EOS
     end
 
     if killed
-      Redwood::log "thread for #{m.id} is killed, ignoring"
+      #Redwood::log "thread for #{m.id} is killed, ignoring"
       false
     else
-      Redwood::log "ran #{num_queries} queries to build thread of #{messages.size} messages for #{m.id}: #{m.subj}" if num_queries > 0
+      #Redwood::log "ran #{num_queries} queries to build thread of #{messages.size} messages for #{m.id}: #{m.subj}" if num_queries > 0
       messages.each { |mid, builder| yield mid, builder }
       true
     end