Merge branch 'cassandra-2.0' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fbdc9f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fbdc9f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fbdc9f8

Branch: refs/heads/trunk
Commit: 8fbdc9f82d949ce2ec262defb5d41c4c47f96c81
Parents: 7233102 3dc4e65
Author: Dave Brosius <dbros...@mebigfatguy.com>
Authored: Fri Oct 25 00:19:53 2013 -0400
Committer: Dave Brosius <dbros...@mebigfatguy.com>
Committed: Fri Oct 25 00:19:53 2013 -0400

----------------------------------------------------------------------
 bin/cqlsh.bat | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply via email to