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/acdbbb93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acdbbb93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acdbbb93 Branch: refs/heads/trunk Commit: acdbbb934023ba9cee24d85766fec9d73dcb4b1e Parents: cf74bcf 8cf97db Author: Dave Brosius <[email protected]> Authored: Wed Apr 23 23:06:49 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed Apr 23 23:06:49 2014 -0400 ---------------------------------------------------------------------- bin/cqlsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
