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/72f47a4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72f47a4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72f47a4e Branch: refs/heads/cassandra-2.0 Commit: 72f47a4e59beb4f8fa8cc4533425871434f0690a Parents: 58014d3 9afac24 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Oct 20 21:56:52 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Oct 20 21:56:52 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliMain.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/72f47a4e/src/java/org/apache/cassandra/cli/CliMain.java ----------------------------------------------------------------------
