You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/04/30 23:29:29 UTC
[1/2] git commit: Ninja-fix PureJavaCrc32
Repository: cassandra
Updated Branches:
refs/heads/trunk 3608129a3 -> 5a9ca7765
Ninja-fix PureJavaCrc32
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68961a6a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68961a6a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68961a6a
Branch: refs/heads/trunk
Commit: 68961a6a9089a8cd374dc90577f2d48b515aa0a7
Parents: 70fd478
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Apr 30 23:29:05 2014 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Apr 30 23:29:05 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/PureJavaCrc32.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68961a6a/src/java/org/apache/cassandra/utils/PureJavaCrc32.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/PureJavaCrc32.java b/src/java/org/apache/cassandra/utils/PureJavaCrc32.java
index 15fe0c6..041652f 100644
--- a/src/java/org/apache/cassandra/utils/PureJavaCrc32.java
+++ b/src/java/org/apache/cassandra/utils/PureJavaCrc32.java
@@ -122,6 +122,7 @@ public class PureJavaCrc32 implements Checksum {
ByteBufferUtil.arrayCopy(b, off, buf, 0, l);
update(buf, 0, l);
len -= l;
+ off += l;
}
}
}
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a9ca776
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a9ca776
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a9ca776
Branch: refs/heads/trunk
Commit: 5a9ca7765fad0e9289891b190456c8b405721faf
Parents: 3608129 68961a6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Apr 30 23:29:23 2014 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Apr 30 23:29:23 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/PureJavaCrc32.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------