commit 1f21bbe18bed5496b9dbc3922240b94863e27bcd
author Dave Brosius <dbrosius@apache.org> Mon Apr 15 01:59:06 2013 -0400
committer Dave Brosius <dbrosius@apache.org> Mon Apr 15 01:59:06 2013 -0400
tree 255af9edd7b2009941ad93680a974f82c9427dff
parent 25014a193f009799bae10cbac291bb83b69f695d
parent 868e7eb3c8e9ab2e175d4142ac1479b1f65f6173

Merge branch 'cassandra-1.1' into cassandra-1.2

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index 2124b15..b17d8e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -166,6 +166,11 @@
  * Adds E notation for floating point numbers (CASSANDRA-4927)
  * Detect (and warn) unintentional use of the cql2 thrift methods when cql3 was
    intended (CASSANDRA-5172)
+ * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
+ * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
+ * Fix cf name extraction from manifest in Directories.migrateFile() (CASSANDRA-5242)
+ * Support pluggable internode authentication (CASSANDRA-5401)
+ * Replace mistaken usage of commons-logging with slf4j (CASSANDRA-5464)
 
 
 1.1.10

src/java/org/apache/cassandra/db/compaction/OperationType.java

diff --git a/src/java/org/apache/cassandra/db/compaction/OperationType.java b/src/java/org/apache/cassandra/db/compaction/OperationType.java
index e46e92d..2416ed1 100644
--- a/src/java/org/apache/cassandra/db/compaction/OperationType.java
+++ b/src/java/org/apache/cassandra/db/compaction/OperationType.java
@@ -29,7 +29,7 @@
     INDEX_BUILD("Secondary index build"),
     /** Compaction for tombstone removal */
     TOMBSTONE_COMPACTION("Tombstone Compaction"),
-    UNKNOWN("Unkown compaction type");
+    UNKNOWN("Unknown compaction type");
 
     private final String type;
 

src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index dcac110..110f61d 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -22,11 +22,9 @@
 import java.nio.ByteBuffer;
 import java.util.*;
 
+
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.exceptions.SyntaxException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.apache.cassandra.auth.IAuthenticator;
 import org.apache.cassandra.db.Column;
 import org.apache.cassandra.db.IColumn;
@@ -51,6 +49,8 @@
 import org.apache.thrift.TDeserializer;
 import org.apache.thrift.TException;
 import org.apache.thrift.TSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A LoadStoreFunc for retrieving data from and storing data to Cassandra
@@ -84,7 +84,7 @@
     private final static String PARTITION_FILTER_SIGNATURE = "cassandra.partition.filter";
 
     private final static ByteBuffer BOUND = ByteBufferUtil.EMPTY_BYTE_BUFFER;
-    private static final Log logger = LogFactory.getLog(CassandraStorage.class);
+    private static final Logger logger = LoggerFactory.getLogger(CassandraStorage.class);
 
     private ByteBuffer slice_start = BOUND;
     private ByteBuffer slice_end = BOUND;