Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0888c2e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0888c2e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0888c2e1 Branch: refs/heads/trunk Commit: 0888c2e18722aacbd53c509655515a3f5bb6601a Parents: 66f3014 8c2a280 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Jun 29 11:37:30 2013 -0700 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Jun 29 11:37:30 2013 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliMain.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0888c2e1/src/java/org/apache/cassandra/cli/CliMain.java ----------------------------------------------------------------------
