cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 22 Aug 2014 18:58:05 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java


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

Branch: refs/heads/trunk
Commit: 3648549a96d367f11b15e743bfc16972c07c2d9e
Parents: bc63083 e3a4fba
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Aug 22 21:57:47 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Aug 22 21:57:47 2014 +0300

----------------------------------------------------------------------
 .../LimitedLocalNodeFirstLocalBalancingPolicy.java | 17 +++++++++++++++++
 .../io/compress/CorruptBlockException.java         | 14 ++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



Mime
View raw message