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/6e070e1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e070e1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e070e1c Branch: refs/heads/trunk Commit: 6e070e1ce05dfb3a914d091875ef878037b7f840 Parents: e9f9c14 8a506e6 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Oct 9 21:52:52 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Oct 9 21:52:52 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tracing/TraceState.java | 1 - 1 file changed, 1 deletion(-) ----------------------------------------------------------------------
