You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/10/02 23:11:06 UTC
[3/4] git commit: fix merge conflict
fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76cb10ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76cb10ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76cb10ca
Branch: refs/heads/trunk
Commit: 76cb10ca92d46ccf9bb3f81f0ad897c6fb9bbf53
Parents: 70239e1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 2 16:10:47 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 2 16:10:47 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tracing/Tracing.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cb10ca/src/java/org/apache/cassandra/tracing/Tracing.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java b/src/java/org/apache/cassandra/tracing/Tracing.java
index aef3816..c000af9 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -170,16 +170,7 @@ public class Tracing
CFMetaData cfMeta = CFMetaData.TraceSessionsCf;
ColumnFamily cf = ArrayBackedSortedColumns.factory.create(cfMeta);
addColumn(cf, buildName(cfMeta, bytes("duration")), elapsed);
-<<<<<<< HEAD
- RowMutation mutation = new RowMutation(TRACE_KS, sessionIdBytes, cf);
- StorageProxy.mutate(Arrays.asList(mutation), ConsistencyLevel.ANY);
-||||||| merged common ancestors
- RowMutation mutation = new RowMutation(TRACE_KS, sessionIdBytes);
- mutation.add(cf);
- StorageProxy.mutate(Arrays.asList(mutation), ConsistencyLevel.ANY);
-=======
mutateWithCatch(new RowMutation(TRACE_KS, sessionIdBytes, cf));
->>>>>>> cassandra-1.2
}
});