Merge branch 'cassandra-1.1.0' into cassandra-1.1

pcmanus · Mar 16, 2012 · 087644b · 087644b
2 parents 555b738 + 97d4c1c
commit 087644b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -347,7 +347,7 @@ protected void runMayThrow() throws IOException
                     {
                         if (sstables.isEmpty())
                         {
-                            logger.error("No file to compact for user defined compaction");
+                            logger.info("No file to compact for user defined compaction");
                         }
                         // attempt to schedule the set
                         else if ((toCompact = cfs.getDataTracker().markCompacting(sstables, 1, Integer.MAX_VALUE)) != null)
@@ -366,7 +366,7 @@ else if ((toCompact = cfs.getDataTracker().markCompacting(sstables, 1, Integer.M
                         }
                         else
                         {
-                            logger.error("SSTables for user defined compaction are already being compacted.");
+                            logger.info("SSTables for user defined compaction are already being compacted.");
                         }
                     }
                     finally