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/2e48e0c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e48e0c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e48e0c4 Branch: refs/heads/trunk Commit: 2e48e0c43a3eb2c733a498a5bde49ec5d2953578 Parents: a161f08 35b7da4 Author: Mikhail Stepura <[email protected]> Authored: Fri Mar 21 11:45:42 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Fri Mar 21 11:45:42 2014 -0700 ---------------------------------------------------------------------- bin/cqlsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
