Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60e8d2bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e8d2bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e8d2bf Branch: refs/heads/trunk Commit: 60e8d2bf0defde4afa6995cc036faeeac2d00a04 Parents: 9a71238 d6f9555 Author: Marcus Eriksson <[email protected]> Authored: Fri Jun 26 08:23:01 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Fri Jun 26 08:23:01 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- bin/cqlsh | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 97 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/60e8d2bf/CHANGES.txt ----------------------------------------------------------------------
