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/b44bbb83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b44bbb83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b44bbb83 Branch: refs/heads/cassandra-2.1.0 Commit: b44bbb83aa997a583dbbdeb7b1375e999fac6dda Parents: a5cc16d 249bbfc Author: Brandon Williams <[email protected]> Authored: Tue Jul 29 13:58:27 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Jul 29 13:58:27 2014 -0500 ---------------------------------------------------------------------- bin/cqlsh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b44bbb83/bin/cqlsh ----------------------------------------------------------------------
