You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/03/27 16:23:41 UTC
[2/5] git commit: Merge branch 'cassandra-2.1' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a775d9c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a775d9c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a775d9c6
Branch: refs/heads/trunk
Commit: a775d9c6e09c934830554399264d1bf22262a50d
Parents: 5749fb1 6d796c7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Mar 27 16:15:04 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Mar 27 16:15:04 2014 +0100
----------------------------------------------------------------------
.../cassandra/db/ArrayBackedSortedColumns.java | 20 ++++++++------------
src/java/org/apache/cassandra/db/Memtable.java | 9 +++++----
2 files changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------