merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2531424c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2531424c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2531424c Branch: refs/heads/trunk Commit: 2531424c0050196512b3f8f785f9041eab1c2ef3 Parents: ca7ba14 53b2d9d Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Oct 13 11:13:55 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Oct 13 11:13:55 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 10 ++++++++-- .../apache/cassandra/db/ColumnFamilyStore.java | 8 ++------ .../AbstractSimplePerColumnSecondaryIndex.java | 19 ------------------- .../org/apache/cassandra/utils/StatusLogger.java | 2 +- 5 files changed, 12 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2531424c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2531424c/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2531424c/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2531424c/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java ----------------------------------------------------------------------
