cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [1/2] git commit: fix bad merge
Date Wed, 30 Apr 2014 00:42:39 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 10373762e -> 212698501


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/a4664328
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4664328
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4664328

Branch: refs/heads/trunk
Commit: a4664328c2be71a39301b1fe92eb9fb4e2d4755b
Parents: bcd1411
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Tue Apr 29 20:39:24 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Tue Apr 29 20:39:24 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tracing/Tracing.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4664328/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 31cc1ab..f650d16 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -206,16 +206,10 @@ public class Tracing
                 ColumnFamily cf = ArrayBackedSortedColumns.factory.create(cfMeta);
                 addColumn(cf, buildName(cfMeta, "coordinator"), FBUtilities.getBroadcastAddress());
                 addParameterColumns(cf, parameters);
-<<<<<<< HEAD
-                addColumn(cf, buildName(cfMeta, "request"), request);
-                addColumn(cf, buildName(cfMeta, "started_at"), started_at);
-                mutateWithCatch(new Mutation(TRACE_KS, sessionIdBytes, cf));
-=======
                 addColumn(cf, buildName(cfMeta, bytes("request")), request);
                 addColumn(cf, buildName(cfMeta, bytes("started_at")), started_at);
                 addParameterColumns(cf, parameters);
-                mutateWithCatch(new RowMutation(TRACE_KS, sessionIdBytes, cf));
->>>>>>> cassandra-2.0
+                mutateWithCatch(new Mutation(TRACE_KS, sessionIdBytes, cf));
             }
         });
     }


Mime
View raw message