Merge branch 'develop' of git://github.com/basho/riak_core into uw-ex…

…ometer-dev

priv/riak_core.schema

@@ -186,6 +186,13 @@
   Size > 1 andalso (Size band (Size-1) =:= 0)
  end}.
 
+%% @doc Number of VNodes allowed to do handoff concurrently.
+{mapping, "handoff_concurrency", "riak_core.handoff_concurrency", [
+  {datatype, integer},
+  {default, 2},
+  {commented, 2}
+]}.
+
 %% @doc Default location of ringstate
 {mapping, "ring.state_dir", "riak_core.ring_state_dir", [
   {default, "{{ring_state_dir}}"}

rebar.config

@@ -7,7 +7,7 @@
 {xref_checks, [undefined_function_calls]}.
 
 {deps, [
-  {lager, "2.0.0", {git, "git://github.com/basho/lager.git", {tag, "2.0.0"}}},
+  {lager, "2.0.*", {git, "git://github.com/basho/lager.git", {tag, "2.0.1"}}},
   {poolboy, ".*", {git, "git://github.com/basho/poolboy.git", {branch, "develop"}}},
   {basho_stats, ".*", {git, "git://github.com/basho/basho_stats.git", {branch, "develop"}}},
   {riak_sysmon, ".*", {git, "git://github.com/basho/riak_sysmon.git", {branch, "develop"}}},

src/riak_core.app.src

@@ -15,7 +15,11 @@
                   crypto,
                   riak_sysmon,
                   os_mon,
-                  exometer
+                  exometer,
+                  basho_stats,
+                  eleveldb,
+                  pbkdf2,
+                  poolboy
                  ]},
   {mod, {riak_core_app, []}},
   {env, [

src/riak_core_tracer.erl

@@ -132,8 +132,8 @@ handle_call({collect, Duration, Nodes}, _From, State) ->
                                  end,
                                  Pid
                          end, self()}),
-    dbg:p(all, call),
     [{ok, N} = dbg:n(N) || N <- Nodes],
+    dbg:p(all, [call]),
     dbg:tpl(?MODULE, trigger_sentinel, []),
     add_tracers(State#state.mfs),
     {reply, ok, State#state{trace=[], stop_tref = Tref, tracing = true}};