svn commit: r1029369 - /cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java

[ee...@apache.org]

Author: eevans
Date: Sun Oct 31 14:38:04 2010
New Revision: 1029369

URL: http://svn.apache.org/viewvc?rev=1029369&view=rev
Log:
correct conflict missed during last rebase/merge

Patch by eevans

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=1029369&r1=1029368&r2=1029369&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Sun Oct 31 14:38:04 2010
@@ -944,33 +944,6 @@ public class CliClient extends CliUserHe
         ColumnParent columnParent = new ColumnParent(columnFamily);
         List<KeySlice> keySlices = thriftClient.get_range_slices(columnParent, predicate, range, ConsistencyLevel.ONE);
         printSliceList(columnFamilyDef, keySlices);
-<<<<<<< HEAD
-    }
-
-    // TRUNCATE <columnFamily>
-    private void executeTruncate(String columnFamily)
-    {
-        if (!CliMain.isConnected() || !hasKeySpace())
-            return;
-
-        // getting CfDef, it will fail if there is no such column family in current keySpace. 
-        CfDef cfDef = getCfDef(columnFamily);
-
-        try
-        {
-            thriftClient.truncate(cfDef.getName());
-            sessionState.out.println(columnFamily + " truncated.");
-        }
-        catch (InvalidRequestException e)
-        {
-            throw new RuntimeException(e.getWhy());
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e.getMessage());
-        }
-=======
->>>>>>> merge from 0.7
     }
 
     // TRUNCATE <columnFamily>