Updated Branches: refs/heads/trunk 342050fcd -> f5cc4760b
fix bad merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5cc4760 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5cc4760 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5cc4760 Branch: refs/heads/trunk Commit: f5cc4760b993355c695253dca925aa58fffb582f Parents: 342050f Author: Jonathan Ellis <[email protected]> Authored: Thu May 23 12:46:38 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu May 23 12:46:38 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/RowMutation.java | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5cc4760/src/java/org/apache/cassandra/db/RowMutation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java index 64069c8..d78247b 100644 --- a/src/java/org/apache/cassandra/db/RowMutation.java +++ b/src/java/org/apache/cassandra/db/RowMutation.java @@ -247,15 +247,6 @@ public class RowMutation implements IMutation return rm; } - public RowMutation without(UUID cfId) - { - RowMutation rm = new RowMutation(table, key); - for (Map.Entry<UUID, ColumnFamily> entry : modifications.entrySet()) - if (!entry.getKey().equals(cfId)) - rm.add(entry.getValue()); - return rm; - } - public static class RowMutationSerializer implements IVersionedSerializer<RowMutation> { public void serialize(RowMutation rm, DataOutput out, int version) throws IOException
