You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/06/20 22:33:54 UTC

[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' 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/90058a97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90058a97
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90058a97

Branch: refs/heads/cassandra-2.0
Commit: 90058a97ac07d0408f1b8f1b4dae66a22832981c
Parents: 9da742d 93f54fc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Jun 20 15:32:26 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Jun 20 15:32:26 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                    |  1 -
 src/java/org/apache/cassandra/db/Memtable.java | 14 ++++----------
 2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90058a97/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90058a97/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------