Updated Branches: refs/heads/cassandra-1.1 8d55474fe -> 1ac90589e refs/heads/cassandra-1.2 fc416fab0 -> 0934bffa1 refs/heads/cassandra-1.2.0 bac979410 -> 8581be8a2 refs/heads/trunk f8f80d3e5 -> 5a7943da4
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/5a7943da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a7943da Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a7943da Branch: refs/heads/trunk Commit: 5a7943da422cf4c0d76a0e1807ffe9c0d1fcd908 Parents: f8f80d3 0934bff Author: Yuki Morishita <[email protected]> Authored: Fri Dec 7 11:43:01 2012 -0600 Committer: Yuki Morishita <[email protected]> Committed: Fri Dec 7 11:43:01 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a7943da/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------
