You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2010/10/31 15:35:22 UTC
svn commit: r1029354 - in
/cassandra/trunk/src/java/org/apache/cassandra/cli: CliClient.java
CliUserHelp.java
Author: eevans
Date: Sun Oct 31 14:35:22 2010
New Revision: 1029354
URL: http://svn.apache.org/viewvc?rev=1029354&view=rev
Log:
merge from 0.7
Modified:
cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.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=1029354&r1=1029353&r2=1029354&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:35:22 2010
@@ -944,6 +944,7 @@ 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>
@@ -968,6 +969,8 @@ public class CliClient extends CliUserHe
{
throw new RuntimeException(e.getMessage());
}
+=======
+>>>>>>> merge from 0.7
}
// SHOW API VERSION
Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java?rev=1029354&r1=1029353&r2=1029354&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliUserHelp.java Sun Oct 31 14:35:22 2010
@@ -331,8 +331,12 @@ public class CliUserHelp {
state.out.println("del <cf>['<key>']['<super>']['<col>'] Delete sub column.");
state.out.println("count <cf>['<key>'] Count columns in record.");
state.out.println("count <cf>['<key>']['<super>'] Count columns in a super column.");
+<<<<<<< HEAD
state.out.println("truncate <column_family> Truncate specified column family.");
state.out.println("list <cf> List all rows in the column family.");
+=======
+ state.out.println("list <cf> List all rows in the column family.");
+>>>>>>> merge from 0.7
state.out.println("list <cf>[<startKey>:]");
state.out.println(" List rows in the column family beginning with <startKey>.");
state.out.println("list <cf>[<startKey>:<endKey>]");