Merge pull request #764 from basho/features/lrb/use-gpb

Use GPB protobuf library.

Author: lukebakken

rebar.config

@@ -9,11 +9,11 @@
 {xref_queries, [{"(XC - UC) || (XU - X - B - cluster_info : Mod)", []}]}.
 
 {deps, [
-        {lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "3.2.2"}}},
-        {ranch, "0.4.0-p1", {git, "git://github.com/basho/ranch.git", {tag, "0.4.0-p1"}}},
-        {ebloom, ".*", {git, "git://github.com/basho/ebloom.git", {tag, "2.0.0"}}},
-        {riak_kv, ".*", {git, "git://github.com/basho/riak_kv.git", {branch, "develop"}}},
-        {riak_repl_pb_api, ".*", {git, "[email protected]:basho/riak_repl_pb_api.git", {tag, "2.4.0"}}}
+        {lager, ".*", {git, "https://github.com/basho/lager.git", {tag, "3.2.2"}}},
+        {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_repl_pb_api, ".*", {git, "[email protected]:basho/riak_repl_pb_api.git", {branch, "develop"}}}
        ]}.
 
 {edoc_opts, [{preprocess, true}]}.

src/riak_repl_pb_get.erl

@@ -56,8 +56,8 @@ decode(?PB_MSG_GET_CLUSTER_ID, <<>>) ->
 encode(#rpbgetresp{} = Msg) ->
     {ok, riak_pb_codec:encode(Msg)};
 encode(#rpbreplgetclusteridresp{} = Msg) ->
-    {ok,
-        [?PB_MSG_RESP_CLUSTER_ID|riak_repl_pb:encode_rpbreplgetclusteridresp(Msg)]}.
+    Resp = riak_repl_pb:encode_rpbreplgetclusteridresp(Msg),
+    {ok, [?PB_MSG_RESP_CLUSTER_ID, Resp]}.
 
 %% Process Protocol Buffer Requests
 %%
@@ -68,7 +68,7 @@ process(#rpbreplgetclusteridreq{}, State) ->
     ClusterId = lists:flatten(
         io_lib:format("~p", [riak_core_ring:cluster_name(Ring)])),
     lager:debug("Repl PB: returning cluster id ~p", [ClusterId]),
-    {reply, #rpbreplgetclusteridresp{cluster_id = ClusterId}, State};
+    {reply, #rpbreplgetclusteridresp{cluster_id = list_to_binary(ClusterId)}, State};
 %% @doc Return Key/Value pair, derived from the KV version
 process(#rpbreplgetreq{bucket=B, key=K, r=R0, pr=PR0, notfound_ok=NFOk,
                        basic_quorum=BQ, if_modified=VClock,