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/889da51b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/889da51b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/889da51b Branch: refs/heads/trunk Commit: 889da51b40bb0da3217dcd349b4ac080430904f7 Parents: bbf3cc5 518c0df Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Oct 4 08:39:41 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Oct 4 08:39:41 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Memtable.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/889da51b/src/java/org/apache/cassandra/db/Memtable.java ----------------------------------------------------------------------
