Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ef1304c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ef1304c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ef1304c Branch: refs/heads/trunk Commit: 0ef1304cb5a38f36607e79635eab4962c2077481 Parents: a6f7d07 4d9fc03 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Oct 9 11:31:52 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Oct 9 11:31:52 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tracing/TraceState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
