You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/04/30 02:42:39 UTC
[1/2] git commit: fix bad merge
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 <db...@mebigfatguy.com>
Authored: Tue Apr 29 20:39:24 2014 -0400
Committer: Dave Brosius <db...@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));
}
});
}
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21269850
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21269850
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21269850
Branch: refs/heads/trunk
Commit: 212698501e96b86d94b6cf938df77c2f749d1923
Parents: 1037376 a466432
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 29 20:39:47 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 29 20:39:47 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/tracing/Tracing.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------