Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc3b9bfd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc3b9bfd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc3b9bfd Branch: refs/heads/trunk Commit: fc3b9bfd7e5cfc1e54b1c3a38981cd2569a51110 Parents: 3c72060 94a01f6 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Tue Oct 25 09:44:24 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Tue Oct 25 09:44:24 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/tracing/TraceStateImpl.java | 7 +++++-- .../org/apache/cassandra/cql3/TraceCqlTest.java | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc3b9bfd/CHANGES.txt ----------------------------------------------------------------------
