You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/03/30 10:00:31 UTC

[1/2] cassandra git commit: Fix sorted docs in CQLSSTableWriter

Repository: cassandra
Updated Branches:
  refs/heads/trunk 04389ad5e -> cc0247b12


Fix sorted docs in CQLSSTableWriter


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

Branch: refs/heads/trunk
Commit: 6ee4b0989d9a3ae3e704918622024fa57fdf63e7
Parents: d3258f6
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Mar 26 13:19:38 2015 -0400
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Mar 30 10:59:55 2015 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ee4b098/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
index b4bef7d..6a4ea04 100644
--- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
@@ -469,8 +469,7 @@ public class CQLSSTableWriter implements Closeable
          * added in SSTable sorted order (and an exception will be thrown if that
          * is not the case during insertion). The SSTable sorted order means that
          * rows are added such that their partition key respect the partitioner
-         * order and for a given partition, that the rows respect the clustering
-         * columns order.
+         * order.
          * <p>
          * You should thus only use this option is you know that you can provide
          * the rows in order, which is rarely the case. If you can provide the


[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: cc0247b1252bf83cbd14057f60fcf18fc10cfacc
Parents: 04389ad 6ee4b09
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Mar 30 11:00:40 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Mar 30 11:00:40 2015 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc0247b1/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
----------------------------------------------------------------------