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

[bugzilla at redhat.com]

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

            Bug ID: 1510324
           Summary: Master branch is broken because of the conflicts
           Product: GlusterFS
           Version: mainline
         Component: build
          Assignee: bugs at gluster.org
          Reporter: rkavunga at redhat.com
                CC: bugs at gluster.org



Description of problem:

An argument from the caller of rpcsvc_program_register was missed because of
the conflicts between I45c3dcdbf39ec90ba39d914432d13a2ace00a5ee and
Id0a2da3632516dc1a5560dde2b151b2e5f0be8e5

Version-Release number of selected component (if applicable):


How reproducible:


Steps to Reproduce:
1.
2.
3.

Actual results:


Expected results:


Additional info:

-- 
You are receiving this mail because:
You are on the CC list for the bug.
You are the assignee for the bug.