586. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 7/6/2017 8:23:28 PM Central 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.

586.1 Files compared

#	Location	File	Last Modified
1	OSCIF_CTT_v4_build 1.zip\rails_prisme\test\fixtures	service_properties.yml	Wed May 31 03:59:08 2017 UTC
2	OSCIF_CTT_v4_build 1.zip\rails_prisme\test\fixtures	service_properties.yml	Mon Jul 3 23:38:23 2017 UTC

586.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	7	176
Changed	6	12
Inserted	0	0
Removed	0	0

586.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

586.4 Active regular expressions

No regular expressions were active.

586.5 Comparison detail

	1	# Read abo ut fixture s at http: //api.ruby onrails.or g/classes/ ActiveReco rd/Fixture Set.html
	2
	3	# To load fixtures r un the fol lowing rak e task
	4	# bundle e xec rake d b:fixtures :load
	5
	6	# tomcat s ervice pro perties
	7	##THIS FIL E IS NOT U SED ANYMOR E! WE ARE USING DB SEED FILES !!!
	8	one:
	9	service: tomcat
	10	key: car go.remote. username
	11	value: d evtest
	12	order_id x: 0
	13	two:
	14	service: tomcat
	15	key: car go.remote. password
	16	value: "[\"jK\\x9 0\\xA1\\x1 Fk\\x87\\x B6\\xAB\\x A3\\xC5\\x E7~\\xBA\\ x1AK\", \" k]\\x95\\x D8w\\x15\\ xFE\\xD3\\ xC7\\xDC\\ xAC\\x9E\\ x1C\\xD0bG \"]"
	17	order_id x: 1
	18	three:
	19	service: tomcat
	20	key: car go.tomcat. manager.ur l
	21	value: h ttps://DNS :PORT
	22	order_id x: 2
	23
	24	# tomcat s ervice pro perties
	25	one_l:
	26	service: tomcat_lo calhost
	27	key: car go.remote. username
	28	value: d evtest
	29	order_id x: 0
	30	two_l:
	31	service: tomcat_lo calhost
	32	key: car go.remote. password
	33	value: " [\"jK\\x90 \\xA1\\x1F k\\x87\\xD 7\\xC3\\xD 8\\xA8\\x9 A\\x18\\xD 4fC\"]"
	34	order_id x: 1
	35	three_l:
	36	service: tomcat_lo calhost
	37	key: car go.tomcat. manager.ur l
	38	value: htt p://localh ost: PORT
	39	order_id x: 2
	40	# nexus se rvice prop erties
	41	six:
	42	service: nexus
	43	key: nex us_reposit ory_url
	44	value: h ttps://DNS :PORT
	45	order_id x: 0
	46	six_and_a_ half:
	47	service: nexus
	48	key: nex us_publica tion_url
	49	value: h ttps://DNS :PORT
	50	order_id x: 1
	51	seven:
	52	service: nexus
	53	key: nex us_user
	54	value: d evtest
	55	order_id x: 2
	56	eight:
	57	service: nexus
	58	key: nex us_pwd
	59	value: " [\"jK\\x90 \\xA1\\x1F k\\x87\\xD 7\\xC3\\xD 8\\xA8\\x9 A\\x18\\xD 4fC\"]"
	60	order_id x: 3
	61
	62	# jenkins service pr operties
	63	nine:
	64	service: jenkins
	65	key: jen kins_root
	66	value: htt ps:// DNS : PORT
	67	order_id x: 0
	68	ten:
	69	service: jenkins
	70	key: jen kins_user
	71	value: d evtest
	72	order_id x: 1
	73	eleven:
	74	service: jenkins
	75	key: jen kins_pwd
	76	value: " [\"jK\\x90 \\xA1\\x1F k\\x87\\xB 6\\xAB\\xA 3\\xC5\\xE 7~\\xBA\\x 1AK\", \"k ]\\x95\\xD 8w\\x15\\x FE\\xD3\\x C7\\xDC\\x AC\\x9E\\x 1C\\xD0bG\ "]"
	77	order_id x: 2
	78
	79	# git serv ice proper ties
	80	twelve:
	81	service: git
	82	key: git _repositor y_url
	83	value: h ttps://DNS :PORT
	84	order_id x: 0
	85	thirteen:
	86	service: git
	87	key: git _user
	88	value: d evtest
	89	order_id x: 1
	90	fourteen:
	91	service: git
	92	key: git _pwd
	93	value: " [\"jK\\x90 \\xA1\\x1F k\\x87\\xD 7\\xC3\\xD 8\\xA8\\x9 A\\x18\\xD 4fC\"]"
	94	order_id x: 2