Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d31d358 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d31d358 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d31d358 Branch: refs/heads/trunk Commit: 1d31d358d2931492c34067612bdf0383934001f2 Parents: 0cff47b dc7e2fd Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Sep 30 02:20:47 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Sep 30 02:20:47 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Memtable.java | 6 +++++- .../apache/cassandra/db/compaction/CompactionManager.java | 4 ++-- .../org/apache/cassandra/db/index/SecondaryIndexManager.java | 8 ++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d31d358/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d31d358/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d31d358/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d31d358/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ----------------------------------------------------------------------
