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/8bdba79f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bdba79f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bdba79f Branch: refs/heads/trunk Commit: 8bdba79f978a56dd5b717d2666671ced5c0f0cf8 Parents: 040e67e 02d5ef3 Author: Jonathan Ellis <[email protected]> Authored: Wed Oct 2 10:38:57 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Oct 2 10:38:57 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/KSMetaData.java | 2 +- .../apache/cassandra/tracing/TraceState.java | 16 +++++--- .../org/apache/cassandra/tracing/Tracing.java | 40 ++++++++++++++++---- 4 files changed, 45 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bdba79f/CHANGES.txt ----------------------------------------------------------------------
