Merge branch 'master' of github.com:basho/machi

This commit is contained in:
Scott Lystig Fritchie 2015-10-08 14:19:54 +09:00
commit 2bfc199294

View file

@ -190,10 +190,17 @@ from_pb_request(_Else) ->
from_pb_response(#mpb_ll_response{ from_pb_response(#mpb_ll_response{
req_id=ReqID, req_id=ReqID,
% There is no separate LL error response record
generic=#mpb_errorresp{code=Code, msg=Msg}}) ->
{ReqID, {error, {Code, Msg}}};
from_pb_response(#mpb_ll_response{
req_id=ReqID,
% There is no separate LL echo response record
echo=#mpb_echoresp{message=Msg}}) -> echo=#mpb_echoresp{message=Msg}}) ->
{ReqID, Msg}; {ReqID, Msg};
from_pb_response(#mpb_ll_response{ from_pb_response(#mpb_ll_response{
req_id=ReqID, req_id=ReqID,
% There is no separate LL auth response record
auth=#mpb_authresp{code=Code}}) -> auth=#mpb_authresp{code=Code}}) ->
{ReqID, Code}; {ReqID, Code};
from_pb_response(#mpb_ll_response{ from_pb_response(#mpb_ll_response{