Updated Branches: refs/heads/trunk abb94957f -> 7fab776f0
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/7fab776f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fab776f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fab776f Branch: refs/heads/trunk Commit: 7fab776f0b442b58f3baa97eeae91edcd2de5f20 Parents: abb9495 0981e9a Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Feb 15 22:53:24 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Feb 15 22:53:24 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/cli/CliOptions.java | 14 ++++++++++++++ .../org/apache/cassandra/cli/CliSessionState.java | 8 ++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fab776f/CHANGES.txt ----------------------------------------------------------------------
