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/b01b67a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b01b67a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b01b67a0 Branch: refs/heads/trunk Commit: b01b67a00d7caae87ded86e8109b14a57c88885f Parents: 723792d 41358f6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Nov 19 16:30:24 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Nov 19 16:30:24 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Memtable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b01b67a0/src/java/org/apache/cassandra/db/Memtable.java ----------------------------------------------------------------------
