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 <[email protected]> Authored: Tue Apr 29 20:39:47 2014 -0400 Committer: Dave Brosius <[email protected]> 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(-) ----------------------------------------------------------------------
