You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/06 10:45:02 UTC
[1/6] cassandra git commit: Fix typo in javadoc
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 3e45fa1ab -> 12b6c0a52
refs/heads/cassandra-3.3 bd2785e9c -> 10c1e65db
refs/heads/trunk 650d76d71 -> cfe31c3b9
Fix typo in javadoc
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12b6c0a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12b6c0a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12b6c0a5
Branch: refs/heads/cassandra-3.0
Commit: 12b6c0a5264138a6f569e5e957362ddaf1a4a0be
Parents: 3e45fa1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 6 10:44:22 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 6 10:44:22 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12b6c0a5/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java
index 8a67e9b..5f79a66 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -394,11 +394,11 @@ public interface Row extends Unfiltered, Collection<ColumnData>
public Clustering clustering();
/**
- * Adds the liveness information for the partition key columns of this row.
+ * Adds the liveness information for the primary key columns of this row.
*
* This call is optional (skipping it is equivalent to calling {@code addPartitionKeyLivenessInfo(LivenessInfo.NONE)}).
*
- * @param info the liveness information for the partition key columns of the built row.
+ * @param info the liveness information for the primary key columns of the built row.
*/
public void addPrimaryKeyLivenessInfo(LivenessInfo info);
[2/6] cassandra git commit: Fix typo in javadoc
Posted by sl...@apache.org.
Fix typo in javadoc
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12b6c0a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12b6c0a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12b6c0a5
Branch: refs/heads/cassandra-3.3
Commit: 12b6c0a5264138a6f569e5e957362ddaf1a4a0be
Parents: 3e45fa1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 6 10:44:22 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 6 10:44:22 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12b6c0a5/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java
index 8a67e9b..5f79a66 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -394,11 +394,11 @@ public interface Row extends Unfiltered, Collection<ColumnData>
public Clustering clustering();
/**
- * Adds the liveness information for the partition key columns of this row.
+ * Adds the liveness information for the primary key columns of this row.
*
* This call is optional (skipping it is equivalent to calling {@code addPartitionKeyLivenessInfo(LivenessInfo.NONE)}).
*
- * @param info the liveness information for the partition key columns of the built row.
+ * @param info the liveness information for the primary key columns of the built row.
*/
public void addPrimaryKeyLivenessInfo(LivenessInfo info);
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10c1e65d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10c1e65d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10c1e65d
Branch: refs/heads/trunk
Commit: 10c1e65db81a0c24081562c25d07f758ae6e3045
Parents: bd2785e 12b6c0a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 6 10:44:36 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 6 10:44:36 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10c1e65d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10c1e65d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10c1e65d
Branch: refs/heads/cassandra-3.3
Commit: 10c1e65db81a0c24081562c25d07f758ae6e3045
Parents: bd2785e 12b6c0a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 6 10:44:36 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 6 10:44:36 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfe31c3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfe31c3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfe31c3b
Branch: refs/heads/trunk
Commit: cfe31c3b9128f2959dc9dd827de6f29fe0da1010
Parents: 650d76d 10c1e65
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 6 10:44:45 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 6 10:44:45 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/6] cassandra git commit: Fix typo in javadoc
Posted by sl...@apache.org.
Fix typo in javadoc
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12b6c0a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12b6c0a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12b6c0a5
Branch: refs/heads/trunk
Commit: 12b6c0a5264138a6f569e5e957362ddaf1a4a0be
Parents: 3e45fa1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 6 10:44:22 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 6 10:44:22 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/rows/Row.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12b6c0a5/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java
index 8a67e9b..5f79a66 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -394,11 +394,11 @@ public interface Row extends Unfiltered, Collection<ColumnData>
public Clustering clustering();
/**
- * Adds the liveness information for the partition key columns of this row.
+ * Adds the liveness information for the primary key columns of this row.
*
* This call is optional (skipping it is equivalent to calling {@code addPartitionKeyLivenessInfo(LivenessInfo.NONE)}).
*
- * @param info the liveness information for the partition key columns of the built row.
+ * @param info the liveness information for the primary key columns of the built row.
*/
public void addPrimaryKeyLivenessInfo(LivenessInfo info);