Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/211d81c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/211d81c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/211d81c2 Branch: refs/heads/trunk Commit: 211d81c24db2da25bc52913a380430df47e72bcc Parents: cbacf85 5613694 Author: Mikhail Stepura <mish...@apache.org> Authored: Thu May 8 15:34:33 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Thu May 8 15:34:33 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/211d81c2/CHANGES.txt ----------------------------------------------------------------------
