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/cb8bda8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb8bda8d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb8bda8d Branch: refs/heads/trunk Commit: cb8bda8d47981d2bde98662c934286d8fade2c6c Parents: 94ba744 37dfe43 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Dec 1 20:47:07 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Dec 1 20:47:07 2014 +0300 ---------------------------------------------------------------------- bin/cqlsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------