Merge branch '1.0'

basho · Dec 15, 2011 · c6a502c · c6a502c
2 parents 787ac57 + f8c6f0f
commit c6a502c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ebin/riak_core.app b/ebin/riak_core.app
@@ -106,7 +106,7 @@
          {vnode_inactivity_timeout, 60000},
 
          %% Number of VNodes allowed to do handoff concurrently.
-         {handoff_concurrency, 4},
+         {handoff_concurrency, 1},
 
          %% Disable Nagle on HTTP sockets
          {disable_http_nagle, false},

diff --git a/src/riak_core_handoff_manager.erl b/src/riak_core_handoff_manager.erl
@@ -54,7 +54,7 @@ get_exclusions(Module) ->
     gen_server:call(?MODULE, {get_exclusions, Module}, infinity).
 
 get_handoff_lock(LockId) ->
-    TokenCount = app_helper:get_env(riak_core, handoff_concurrency, 4),
+    TokenCount = app_helper:get_env(riak_core, handoff_concurrency, 1),
     get_handoff_lock(LockId, TokenCount).
 
 get_handoff_lock(_LockId, 0) ->