Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/269ed635 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/269ed635 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/269ed635 Branch: refs/heads/trunk Commit: 269ed635e3d52fa58cc036ac992b523bf8d6a0f9 Parents: 4fe3bb1 5f31757 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Mar 7 11:17:46 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Mar 7 11:17:46 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/269ed635/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/269ed635/src/resources/org/apache/cassandra/cli/CliHelp.yaml ----------------------------------------------------------------------