Bug 823982

Summary:	Support merging RHQ and customer updates to agent log4j.xml
Product:	[Other] RHQ Project	Reporter:	Charles Crouch <ccrouch>
Component:	Agent	Assignee:	Nobody <nobody>
Status:	NEW ---	QA Contact:
Severity:	unspecified	Docs Contact:
Priority:	unspecified
Version:	4.4	CC:	hrupp
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:		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:
Bug Depends On:
Bug Blocks:	823965

Description Charles Crouch 2012-05-22 14:34:41 UTC

We should support the following scenarios around log4j.xml when auto upgrading agents:

1) add/update/remove entries in log4j.xml where the customer has *not* made any updates from the previous release.
2) add/update/remove entries in log4j.xml where the customer *has* made updates from the previous release. But the two sets of updates (ours and the customers) *can* be merged
3) add/update/remove entries in log4j.xml where the customer *has* made updates from the previous release. But the two sets of updates (ours and the customers) *cannot* be merged. In which case our updates should probably be used and the customers old updated version should be left alongside the new version for manual merging (e.g. similar to how rpm handles config file conflicts)

Comment 1 Mike Foley 2012-05-29 14:41:30 UTC

per BZ Triage 5/29/2012 (ccrouch, loleary, asantos, mfoley, myarborough) moving these to JON 3.1.1 or later