Post-2.0 merge cleanup after review of changes.

Author: Doug Rohrer

docs/ring-resizing.md

@@ -243,12 +243,16 @@ isn't implicitly enlarged during the transition, it is not used during expansion
 One other minor change made to the vnode interface, regardless of
 whether or not resizing is being used, is the first argument
 of `handoff_starting/2` is now passed as `{HOType, {Idx, Node}}`.
-`HOType` is one of `ownership`, `hinted`, `resize`, or `repair`.
+`HOType` is one of `ownership`, `hinted`, or `resize`.
 The `Idx` being transferred to is always the index
 of the current partition, except in the case of `resize`.
 `Node` is the node being transferred to (this used to be the argument
 passed into `handoff_starting/2`).
 
+Note: `HOType` is of type `riak_core_handoff_manager:ho_type()`, which includes
+`repair`, but since repairs are started through a different code path it will
+never be passed to `handoff_starting/2`.
+
 ### Cleaning Up
 
 To ensure data is not lost in the case the operation fails or is

src/riak_core_vnode_manager.erl

@@ -715,7 +715,7 @@ update_handoff(AllVNodes, Ring, CHBin, State) ->
                                        false ->
                                            [];
                                        {true, primary, TargetNode} ->
-                                           [{{Mod, Idx}, {ownership_handoff, outbound, TargetNode}}];
+                                           [{{Mod, Idx}, {ownership, outbound, TargetNode}}];
                                        {true, {fallback, _Node}, TargetNode} ->
                                            [{{Mod, Idx}, {hinted, outbound, TargetNode}}];
                                        {true, '$resize'=Action} ->