Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48D54109AE for ; Wed, 30 Apr 2014 00:42:41 +0000 (UTC) Received: (qmail 29785 invoked by uid 500); 30 Apr 2014 00:42:40 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 29739 invoked by uid 500); 30 Apr 2014 00:42:39 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 29730 invoked by uid 99); 30 Apr 2014 00:42:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Apr 2014 00:42:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5566E99669C; Wed, 30 Apr 2014 00:42:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Wed, 30 Apr 2014 00:42:39 -0000 Message-Id: <0e67972cbb5d45998f4a2cfff814b314@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Tue Apr 29 20:39:24 2014 -0400 Committer: Dave Brosius 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)); } }); }