Note: This bug is displayed in read-only format because the product is no longer active in Red Hat Bugzilla.

Bug 1428099

Summary:	Fix merge error which broke all the things
Product:	[Community] GlusterFS	Reporter:	Vijay Bellur <vbellur>
Component:	core	Assignee:	bugs <bugs>
Status:	CLOSED CURRENTRELEASE	QA Contact:
Severity:	unspecified	Docs Contact:
Priority:	unspecified
Version:	mainline	CC:	bugs
Target Milestone:	---	Keywords:	Triaged
Target Release:	---
Hardware:	Unspecified
OS:	Unspecified
Whiteboard:
Fixed In Version:		Doc Type:	If docs needed, set a value
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2019-04-17 10:22:30 UTC	Type:	---
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:
Embargoed:

Description Vijay Bellur 2017-03-01 19:07:12 UTC

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>

Comment 1 Yaniv Kaul 2019-04-17 10:22:30 UTC

Merged early 2017, closing.