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 49398109AF for ; Wed, 30 Apr 2014 00:42:41 +0000 (UTC) Received: (qmail 29849 invoked by uid 500); 30 Apr 2014 00:42:40 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 29749 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 29731 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 5B25E99669E; 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:40 -0000 Message-Id: <5ce1113dd91b42fe96cacc71805d9111@git.apache.org> In-Reply-To: <0e67972cbb5d45998f4a2cfff814b314@git.apache.org> References: <0e67972cbb5d45998f4a2cfff814b314@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1' into trunk 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 Authored: Tue Apr 29 20:39:47 2014 -0400 Committer: Dave Brosius 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(-) ----------------------------------------------------------------------