Bug 838549

Summary:	Integration-Branch.patch contains conflict markers
Product:	Red Hat Enterprise MRG	Reporter:	Florian Weimer <fweimer>
Component:	condor	Assignee:	grid-maint-list <grid-maint-list>
Status:	CLOSED NOTABUG	QA Contact:	MRG Quality Engineering <mrgqe-bugs>
Severity:	unspecified	Docs Contact:
Priority:	unspecified
Version:	Development	CC:	matt, tstclair
Target Milestone:	---
Target Release:	---
Hardware:	Unspecified
OS:	Unspecified
Whiteboard:
Fixed In Version:		Doc Type:	Bug Fix
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2012-07-10 14:00:38 UTC	Type:	Bug
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:
Embargoed:

Description Florian Weimer 2012-07-09 12:45:41 UTC

The Integration-Branch.patch file patches files with conflict markers (as of version 7.6.5-0.17):

+<<<<<<< HEAD
+=======
+  \item \verb@DAEMON_LIST@
+>>>>>>> origin/UPSTREAM-7.7.0-BZ713511-POST-dag-script
   \item \verb@FetchWorkDelay@
   \item \verb@MAX_NUM_CPUS@
   \item \verb@MAX_TRACKING_GID@
@@ -437,6 +441,10 @@ the changed value.
   \item \verb@CKPT_SERVER@
   \item \verb@COLLECTOR@
   \item \verb@DBMSD@
+<<<<<<< HEAD
+=======
+  \item \verb@EC2_GAHP@
+>>>>>>> origin/UPSTREAM-7.7.0-BZ713511-POST-dag-script

They appear to have been introduce in 7.6.5-0.13.

This could be benign, but I think it's worth cleaning this up.

Comment 1 Timothy St. Clair 2012-07-10 14:00:38 UTC

It is benign, these are markers in the main documentation which is not used in our packages.   I purposefully did not fix b/c it is a zero sum gain.