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/a40e162b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a40e162b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a40e162b Branch: refs/heads/cassandra-1.1 Commit: a40e162ba891de94a2a2e7d442019032edf370ed Parents: 7935448 41314a2 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Mar 30 11:24:29 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Mar 30 11:24:29 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/a40e162b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a40e162b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
