Updated Branches: refs/heads/trunk 563417451 -> a007e1b5f
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/a007e1b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a007e1b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a007e1b5 Branch: refs/heads/trunk Commit: a007e1b5f8fd71d572041fdff5abb2d70d66363b Parents: 5634174 9118764 Author: Sylvain Lebresne <[email protected]> Authored: Mon Nov 12 12:20:06 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Nov 12 12:20:06 2012 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
