Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36aae612 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36aae612 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36aae612 Branch: refs/heads/trunk Commit: 36aae612a0b248c2650ef979b9230e50410b7415 Parents: 140b031 18f3a79 Author: Jonathan Ellis <[email protected]> Authored: Fri Jun 21 10:39:36 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Jun 21 10:39:36 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/OutboundTcpConnection.java | 3 ++- .../org/apache/cassandra/tracing/ExpiredTraceState.java | 2 +- src/java/org/apache/cassandra/tracing/TraceState.java | 4 +--- src/java/org/apache/cassandra/tracing/Tracing.java | 9 ++++----- 4 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36aae612/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36aae612/src/java/org/apache/cassandra/tracing/TraceState.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36aae612/src/java/org/apache/cassandra/tracing/Tracing.java ----------------------------------------------------------------------
