Merge branch 'trunk'
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddc0f66d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddc0f66d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddc0f66d Branch: refs/heads/trunk Commit: ddc0f66d97afc263918f70601b77d82301679e36 Parents: 4831bf4 db70f5a Author: Brandon Williams <bran...@datastax.com> Authored: Thu Jul 17 16:00:12 2014 -0500 Committer: Brandon Williams <bran...@datastax.com> Committed: Thu Jul 17 16:00:12 2014 -0500 ---------------------------------------------------------------------- bin/cqlsh | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
