Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3dcc8c25 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dcc8c25 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dcc8c25 Branch: refs/heads/cassandra-2.1 Commit: 3dcc8c25e542d5473a78404a027ca6acb3cc065f Parents: dce5599 972d3da Author: Mikhail Stepura <mish...@apache.org> Authored: Thu Mar 13 14:07:04 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Thu Mar 13 14:07:04 2014 -0700 ---------------------------------------------------------------------- bin/cqlsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dcc8c25/bin/cqlsh ----------------------------------------------------------------------
