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/9c739eb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c739eb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c739eb7 Branch: refs/heads/trunk Commit: 9c739eb753f143abc5bc5cbd05e2f76041e1069c Parents: edeebed 5522a18 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Nov 9 03:07:25 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Nov 9 03:07:25 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/tracing.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c739eb7/CHANGES.txt ----------------------------------------------------------------------
