Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37dfe430 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37dfe430 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37dfe430 Branch: refs/heads/trunk Commit: 37dfe430349d18fa950fc9b0b88acc1ae2a83502 Parents: 9a4712e 902e43b Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Dec 1 20:46:41 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Dec 1 20:46:41 2014 +0300 ---------------------------------------------------------------------- bin/cqlsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/37dfe430/bin/cqlsh ----------------------------------------------------------------------
