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/0b0c9e41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b0c9e41 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b0c9e41 Branch: refs/heads/trunk Commit: 0b0c9e419e46beb8f620fd4970cb7c482fd63d23 Parents: d32f1eb 72f47a4 Author: Dave Brosius <[email protected]> Authored: Sun Oct 20 21:59:05 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Oct 20 21:59:05 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliMain.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
