Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f664786 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f664786 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f664786 Branch: refs/heads/trunk Commit: 9f664786449ad0d208579e1cb4db3988cbbcac7a Parents: 1a3cd2a 65cd580 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Aug 25 00:24:49 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Aug 25 00:24:49 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Memtable.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
