4. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 10/2/2017 1:40:03 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.

4.1 Files compared

#	Location	File	Last Modified
1	chef-repo.zip\chef-repo\machine_cookbooks\cds_provision\attributes	cdsdb.rb	Thu Mar 23 16:44:18 2017 UTC
2	chef-repo.zip\chef-repo\machine_cookbooks\cds_provision\attributes	cdsdb.rb	Mon Oct 2 14:36:06 2017 UTC

4.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	44
Changed	2	8
Inserted	0	0
Removed	0	0

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

4.4 Active regular expressions

No regular expressions were active.

4.5 Comparison detail

	1	#
	2	# Cookbook Name:: cd s_provisio ner
	3	# Attribut es:: cdsdb
	4	#
	5
	6
	7	default[:c ds_provisi on][:cdsdb ][:copy_fi les] = {}
	8
	9	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	10	# cdsdb sp ecific aws configura tion optio ns
	11	default[:c ds_provisi on][:cdsdb ][:aws][:i nstance_ty pe] = "m3. medium"
	12	default[:c ds_provisi on][:cdsdb ][:aws][:s ubnet] = " REDACTED "
	13	default[:c ds_provisi on][:cdsdb ][:aws][:s sh_usernam e] = " REDACTED "
	14	default[:c ds_provisi on][:cdsdb ][:aws][:s sh_keyname ] = " REDACTED "
	15	default[:c ds_provisi on][:cdsdb ][:aws][:s sh_key_pat h] = "#{EN V['HOME']} /Projects/ vistacore/ .chef/keys /#{node[:c ds_provisi on][:cdsdb ][:aws][:s sh_keyname ]}"
	16	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	17
	18	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	19	# cdsdb sp ecific vag rant confi guration o ptions
	20	default[:c ds_provisi on][:cdsdb ][:vagrant ][:ip_addr ess] = " IP "
	21	default[:c ds_provisi on][:cdsdb ][:vagrant ][:provide r_config] = {
	22	:memory => 1024
	23	}
	24	default[:c ds_provisi on][:cdsdb ][:vagrant ][:copy_fi les] = {}
	25	default[:c ds_provisi on][:cdsdb ][:vagrant ][:shared_ folders] = []
	26	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########