[1/6] git commit: Merge branch 'cassandra-1.1' into trunk

[slebresne]

Updated Branches:
  refs/heads/trunk 7b38d6a4d -> ec04fe3ca


Merge branch 'cassandra-1.1' into trunk

Conflicts:
        src/java/org/apache/cassandra/db/HintedHandOffManager.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec04fe3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec04fe3c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec04fe3c

Branch: refs/heads/trunk
Commit: ec04fe3ca1f4917ad94747de27c63915aff16b1f
Parents: 7b38d6a 7c50df3
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Apr 17 18:15:38 2012 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Apr 17 18:15:38 2012 +0200

----------------------------------------------------------------------
 .../apache/cassandra/db/HintedHandOffManager.java  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec04fe3c/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 8c07bfd,2a3e6b1..178aca4
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -278,7 -279,7 +278,7 @@@ public class HintedHandOffManager imple
  
          if (!FailureDetector.instance.isAlive(endpoint))
          {
-             logger.info("Endpoint {} died before hint delivery, aborting", 
endpoint);
 -            logger_.debug("Endpoint {} died before hint delivery, aborting", 
endpoint);
++            logger.debug("Endpoint {} died before hint delivery, aborting", 
endpoint);
              return;
          }