Merge develop-2.2 into develop

Author: fadushin

rebar.config

@@ -12,7 +12,7 @@
         {lager, ".*", {git, "https://github.com/basho/lager.git", {tag, "3.2.4"}}},
         {ranch, "0.4.0-p1", {git, "https://github.com/basho/ranch.git", {tag, "0.4.0-p1"}}},
         {ebloom, ".*", {git, "https://github.com/basho/ebloom.git", {tag, "2.0.0"}}},
-        {riak_kv, ".*", {git, "https://github.com/basho/riak_kv.git", {branch, "develop"}}},
+        {riak_kv, ".*", {git, "https://github.com/basho/riak_kv.git", {tag, "2.1.8"}}},
         {riak_repl_pb_api, ".*", {git, "[email protected]:basho/riak_repl_pb_api.git", {tag, "2.6.0"}}}
        ]}.
 

src/riak_repl2_pg.erl

@@ -27,7 +27,7 @@ status() ->
     LeaderNode = riak_repl2_leader:leader_node(),
     case LeaderNode of
         undefined ->
-            {[], []};
+            [{proxy_get, []}];
         _ ->
             ReqStats = try riak_repl2_pg_block_requester_sup:started(LeaderNode) of
                 [] ->