You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/07/15 12:44:21 UTC
cassandra git commit: fix bad merge/rebase
Repository: cassandra
Updated Branches:
refs/heads/trunk 6c14c3af7 -> 4cea221f9
fix bad merge/rebase
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cea221f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cea221f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cea221f
Branch: refs/heads/trunk
Commit: 4cea221f957fe6f35237895550d65c7d402d2cee
Parents: 6c14c3a
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jul 15 11:43:25 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jul 15 11:43:51 2015 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/db/partitions/PartitionUpdate.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cea221f/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
index 09e4c03..670b1ae 100644
--- a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
+++ b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
@@ -470,12 +470,6 @@ public class PartitionUpdate extends AbstractPartitionData implements Sorting.So
sort();
}
- public int rowCount()
- {
- maybeSort();
- return super.rowCount();
- }
-
private synchronized void sort()
{
if (isSorted)