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/31a84ac0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31a84ac0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31a84ac0 Branch: refs/heads/trunk Commit: 31a84ac02e49a47aba384de2242991004c22f6c8 Parents: cfcc575 941cd45 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Oct 23 22:39:11 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Oct 23 22:39:11 2013 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 14 ++++++++++++-- pylib/cqlshlib/cql3handling.py | 2 +- pylib/cqlshlib/tracing.py | 8 +++++++- 4 files changed, 21 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/31a84ac0/CHANGES.txt ----------------------------------------------------------------------
