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> Reviewed-on: https://review.gluster.org/16466 CentOS-regression: Gluster Build System <jenkins.org> NetBSD-regression: NetBSD Build System <jenkins.org> Smoke: Gluster Build System <jenkins.org> Reviewed-by: Shreyas Siravara <sshreyas>
Merged early 2017, closing.