26152. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 5/14/2018 1:18:36 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

26152.1 Files compared

#	Location	File	Last Modified
1	MCCF_EDI_TAS_Infrastructure.zip\MCCF_EDI_TAS_Infrastructure\mag_sys_build\files	client-config-overrides.txt	Tue Mar 27 23:51:12 2018 UTC
2	MCCF_EDI_TAS_Infrastructure.zip\MCCF_EDI_TAS_Infrastructure\mag_sys_build\files	client-config-overrides.txt	Fri May 11 20:22:27 2018 UTC

26152.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	38
Changed	2	4
Inserted	0	0
Removed	0	0

26152.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

26152.4 Active regular expressions

No regular expressions were active.

26152.5 Comparison detail

	1	# RHN Clie nt (rhn_re gister/up2 date) conf ig-overrid es file v4 .0
	2	#
	3	# To be us ed only in conjuctio n with cli ent_config _update.py
	4	#
	5	# This fil e was auto generated.
	6	#
	7	# The simp le rules:
	8	# - a setting ex plicitely overwrites the setti ng in
	9	# /e tc/syconfi g/rhn/{rhn _register, up2date} o n the clie nt system.
	10	# - if a setting is remove d, the cli ent's stat e for that setting r emains
	11	# un changed.
	12
	13	enableProx y=0
	14	enableProx yAuth=0
	15	httpProxy=
	16	noSSLServe rURL=http: // DNS . URL /XMLRPC
	17	proxyPassw ord=
	18	proxyUser=
	19	serverURL= https:// DNS . URL /XMLRPC
	20	sslCACert= /usr/share /rhn/RHN-O RG-TRUSTED -SSL-CERT
	21	useGPG=1