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/c61a7e47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c61a7e47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c61a7e47 Branch: refs/heads/trunk Commit: c61a7e470426af5faafcb0fef613651c70f9c2da Parents: 33060c6 37abae6 Author: Mikhail Stepura <mish...@apache.org> Authored: Sat Jul 12 14:21:08 2014 +1100 Committer: Mikhail Stepura <mish...@apache.org> Committed: Sat Jul 12 14:21:08 2014 +1100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c61a7e47/CHANGES.txt ----------------------------------------------------------------------