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/82d81992 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d81992 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d81992 Branch: refs/heads/trunk Commit: 82d819920af6d21e68315109f56f0c1a3682838b Parents: c996a36 14151a4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jul 17 15:57:08 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jul 17 15:57:08 2014 -0500 ---------------------------------------------------------------------- bin/cqlsh | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
