[Bugs] [Bug 1510324] Master branch is broken because of the conflicts

[bugzilla at redhat.com]

https://bugzilla.redhat.com/show_bug.cgi?id=1510324



--- Comment #2 from Worker Ant <bugzilla-bot at gluster.org> ---
COMMIT: https://review.gluster.org/18680 committed in master by  

------------- protocol/server: Add an argument to rpcsvc_program_register

Because of the conflicts between changes [1] and [2], a new argument
was missed from the caller of rpcsvc_program_register.

[1] : Id0a2da3632516dc1a5560dde2b151b2e5f0be8e5
[2] : I45c3dcdbf39ec90ba39d914432d13a2ace00a5ee

Change-Id: If53f755727f1bb23e0b9fb45ebf25fbc80d770a2
BUG: 1510324
Signed-off-by: Mohammed Rafi KC <rkavunga at redhat.com>

-- 
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=VStZZLrRQD&a=cc_unsubscribe