Updated Branches: refs/heads/trunk caba4ee62 -> 29804fa9a
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29804fa9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29804fa9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29804fa9 Branch: refs/heads/trunk Commit: 29804fa9a5e40047ae08f3fbb063650532d5ecab Parents: caba4ee 269ed63 Author: Sylvain Lebresne <[email protected]> Authored: Wed Mar 7 11:18:38 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Mar 7 11:18:38 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/SliceFromReadCommand.java | 2 +- .../org/apache/cassandra/cli/CliHelp.yaml | 29 +++++++++++++-- 3 files changed, 27 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29804fa9/src/java/org/apache/cassandra/db/SliceFromReadCommand.java ----------------------------------------------------------------------
