Updated Branches: refs/heads/cassandra-1.1 7a510ac08 -> eacdca02d refs/heads/trunk 2ce8274c6 -> 708ab005a
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/708ab005 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/708ab005 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/708ab005 Branch: refs/heads/trunk Commit: 708ab005a4faadb6804334ae63c3c8b1762a83e4 Parents: 2ce8274 eacdca0 Author: Brandon Williams <[email protected]> Authored: Mon Jun 25 12:38:45 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Jun 25 12:38:45 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + src/java/org/apache/cassandra/db/Table.java | 2 +- .../cassandra/db/index/SecondaryIndexManager.java | 2 +- .../apache/cassandra/io/sstable/SSTableLoader.java | 13 +++++++++++- .../apache/cassandra/service/StorageService.java | 16 +++++++++++--- 5 files changed, 28 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/708ab005/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/708ab005/src/java/org/apache/cassandra/db/Table.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/708ab005/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/708ab005/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/708ab005/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
