You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/02/19 13:13:48 UTC
[1/3] cassandra git commit: ninja fix patch application
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 36dc512ad -> 6065f2c8a
refs/heads/trunk 555f89c5a -> e034d3fd7
ninja fix patch application
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6065f2c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6065f2c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6065f2c8
Branch: refs/heads/cassandra-2.1
Commit: 6065f2c8a79ccbd2b203929dda7237af1ca80402
Parents: 36dc512
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Feb 19 12:13:14 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Feb 19 12:13:14 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/SafeMemory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6065f2c8/src/java/org/apache/cassandra/io/util/SafeMemory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/SafeMemory.java b/src/java/org/apache/cassandra/io/util/SafeMemory.java
index d722348..74a1f1e 100644
--- a/src/java/org/apache/cassandra/io/util/SafeMemory.java
+++ b/src/java/org/apache/cassandra/io/util/SafeMemory.java
@@ -90,9 +90,9 @@ public class SafeMemory extends Memory implements SharedCloseable
}
@Inline
- protected void checkPosition(long offset)
+ protected void checkBounds(long start, long end)
{
assert peer != 0 || size == 0 : ref.printDebugInfo();
- super.checkPosition(offset);
+ super.checkBounds(start, end);
}
}
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@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/e034d3fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e034d3fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e034d3fd
Branch: refs/heads/trunk
Commit: e034d3fd7d8756bfba42f3fb7370e3a604e22fac
Parents: 555f89c 6065f2c
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Feb 19 12:13:37 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Feb 19 12:13:37 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/SafeMemory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: ninja fix patch application
Posted by be...@apache.org.
ninja fix patch application
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6065f2c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6065f2c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6065f2c8
Branch: refs/heads/trunk
Commit: 6065f2c8a79ccbd2b203929dda7237af1ca80402
Parents: 36dc512
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Feb 19 12:13:14 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Feb 19 12:13:14 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/SafeMemory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6065f2c8/src/java/org/apache/cassandra/io/util/SafeMemory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/SafeMemory.java b/src/java/org/apache/cassandra/io/util/SafeMemory.java
index d722348..74a1f1e 100644
--- a/src/java/org/apache/cassandra/io/util/SafeMemory.java
+++ b/src/java/org/apache/cassandra/io/util/SafeMemory.java
@@ -90,9 +90,9 @@ public class SafeMemory extends Memory implements SharedCloseable
}
@Inline
- protected void checkPosition(long offset)
+ protected void checkBounds(long start, long end)
{
assert peer != 0 || size == 0 : ref.printDebugInfo();
- super.checkPosition(offset);
+ super.checkBounds(start, end);
}
}