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/deee02c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/deee02c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/deee02c5 Branch: refs/heads/trunk Commit: deee02c538650a31663f5fea3d22ab38e9435bf1 Parents: 8b49af0 e0502ea Author: Tyler Hobbs <[email protected]> Authored: Fri May 23 16:32:12 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri May 23 16:32:12 2014 -0500 ---------------------------------------------------------------------- bin/cqlsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
