Updated Branches: refs/heads/cassandra-1.0 5cde93d96 -> 4a6531172 refs/heads/cassandra-1.1 79354482a -> a40e162ba refs/heads/cassandra-1.1.0 e5a324e31 -> 41314a21d refs/heads/trunk 38515b19a -> 6c5b1b663
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/6c5b1b66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c5b1b66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c5b1b66 Branch: refs/heads/trunk Commit: 6c5b1b66342e8f9ffbbe2d72680f745f2d54e625 Parents: 38515b1 a40e162 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 30 11:24:37 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 30 11:24:37 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 ++++- .../org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- .../apache/cassandra/db/SliceFromReadCommand.java | 2 +- src/java/org/apache/cassandra/utils/CLibrary.java | 8 +++----- 4 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c5b1b66/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c5b1b66/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c5b1b66/src/java/org/apache/cassandra/db/SliceFromReadCommand.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c5b1b66/src/java/org/apache/cassandra/utils/CLibrary.java ----------------------------------------------------------------------
