cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 27 Mar 2014 15:02:55 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
	src/java/org/apache/cassandra/db/Memtable.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da6f78d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da6f78d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da6f78d2

Branch: refs/heads/trunk
Commit: da6f78d2b899c9759336e7235e876586160ca79a
Parents: 5897956 6d796c7
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Mar 27 18:02:30 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Mar 27 18:02:30 2014 +0300

----------------------------------------------------------------------
 .../cassandra/db/ArrayBackedSortedColumns.java  | 20 ++++++++------------
 src/java/org/apache/cassandra/db/Memtable.java  |  9 +++++----
 2 files changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------



Mime
View raw message