Updated Branches: refs/heads/trunk dbb021be4 -> 94033dbbd
GIRAPH-854: fix for test fail due to GIRAPH-840 (pavanka via majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/94033dbb Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/94033dbb Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/94033dbb Branch: refs/heads/trunk Commit: 94033dbbd6f20e03b64b63095a52939a654e52ac Parents: dbb021b Author: Maja Kabiljo <[email protected]> Authored: Fri Feb 14 11:18:21 2014 -0800 Committer: Maja Kabiljo <[email protected]> Committed: Fri Feb 14 11:18:21 2014 -0800 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../src/main/java/org/apache/giraph/conf/GiraphConstants.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/94033dbb/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index c01fa83..32928f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-854: fix for test fail due to GIRAPH-840 (pavanka via majakabiljo) + GIRAPH-853: Fix concurrency issue in GiraphMetrics (majakabiljo) GIRAPH-840: Upgrade to netty 4 (pavanka via majakabiljo) http://git-wip-us.apache.org/repos/asf/giraph/blob/94033dbb/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java index 61830e8..732827c 100644 --- a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java +++ b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java @@ -471,12 +471,12 @@ public interface GiraphConstants { /** Use netty pooled memory buffer allocator */ BooleanConfOption NETTY_USE_POOLED_ALLOCATOR = new BooleanConfOption( - "giraph.useNettyPooledAllocator", true, "Should netty use pooled " + + "giraph.useNettyPooledAllocator", false, "Should netty use pooled " + "memory allocator?"); /** Use direct memory buffers in netty */ BooleanConfOption NETTY_USE_DIRECT_MEMORY = new BooleanConfOption( - "giraph.useNettyDirectMemory", true, "Should netty use direct " + + "giraph.useNettyDirectMemory", false, "Should netty use direct " + "memory buffers"); /** How big to make the encoder buffer? */
