Updated Branches: refs/heads/trunk 0474c3a33 -> 2efeaf3ec
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/2efeaf3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2efeaf3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2efeaf3e Branch: refs/heads/trunk Commit: 2efeaf3ecde1a748aa08e816352cd803d154fe05 Parents: 0474c3a 205a993 Author: Dave Brosius <[email protected]> Authored: Thu Jan 17 00:35:09 2013 -0500 Committer: Dave Brosius <[email protected]> Committed: Thu Jan 17 00:35:09 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 5 ++++ .../cassandra/db/ColumnFamilyStoreMBean.java | 6 +++++ src/java/org/apache/cassandra/db/DataTracker.java | 18 +++++++++++++++ .../cassandra/io/sstable/SSTableMetadata.java | 12 +++++++++- .../apache/cassandra/io/sstable/SSTableReader.java | 5 ++++ 6 files changed, 47 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2efeaf3e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2efeaf3e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2efeaf3e/src/java/org/apache/cassandra/db/DataTracker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2efeaf3e/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ----------------------------------------------------------------------
