[Bugs] [Bug 1428099] New: Fix merge error which broke all the things

[bugzilla at redhat.com]

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

            Bug ID: 1428099
           Summary: Fix merge error which broke all the things
           Product: GlusterFS
           Version: mainline
         Component: core
          Assignee: bugs at gluster.org
          Reporter: vbellur at redhat.com
                CC: bugs at gluster.org



Fix merge error which broke all the things

Summary:

Fix merge error which broke all the things.

Test Plan:

prove tests/basic/accept_v4v6.t

Reviewers:

Subscribers:

Tasks:

Blame Revision:

Change-Id: I65a3e1c60d7e63093c29e7357cc92cda385bce46
Signed-off-by: Kevin Vigor <kvigor at fb.com>
Reviewed-on: https://review.gluster.org/16466
CentOS-regression: Gluster Build System <jenkins at build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins at build.gluster.org>
Smoke: Gluster Build System <jenkins at build.gluster.org>
Reviewed-by: Shreyas Siravara <sshreyas at fb.com>

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