Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b87270b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b87270b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b87270b3 Branch: refs/heads/trunk Commit: b87270b3915887720677e4f20eea21b79a32c811 Parents: cfadbb8 09a4dc0 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Aug 12 17:07:12 2013 +0200 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Aug 12 17:07:12 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 2 ++ bin/cqlsh | 27 +++++++++++++++------------ pylib/cqlshlib/test/test_cqlsh_output.py | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b87270b3/CHANGES.txt ----------------------------------------------------------------------
