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

6.1 Files compared

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

6.2 Comparison summary

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

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

6.4 Active regular expressions

No regular expressions were active.

6.5 Comparison detail

	1	#
	2	# Cookbook Name:: cd s_provisio n
	3	# Attribut es:: openc ds
	4
	5	default[:c ds_provisi on][:openc ds][:copy_ files] = { }
	6
	7	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	8	# opencds specific a ws configu ration opt ions
	9	default[:c ds_provisi on][:openc ds][:aws][ :instance_ type] = "m 3.medium"
	10	default[:c ds_provisi on][:openc ds][:aws][ :subnet] = " REDACTED "
	11	default[:c ds_provisi on][:openc ds][:aws][ :ssh_usern ame] = " REDACTED "
	12	default[:c ds_provisi on][:openc ds][:aws][ :ssh_keyna me] = " REDACTED "
	13	default[:c ds_provisi on][:openc ds][:aws][ :ssh_key_p ath] = "#{ ENV['HOME' ]}/Project s/vistacor e/.chef/ke ys/#{node[ :cds_provi sion][:ope ncds][:aws ][:ssh_key name]}"
	14	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	15
	16	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########
	17	# opencds specific v agrant con figuration options
	18	default[:c ds_provisi on][:openc ds][:vagra nt][:ip_ad dress] = " IP "
	19	default[:c ds_provisi on][:openc ds][:vagra nt][:provi der_config ] = {
	20	:memory => 1024
	21	}
	22	default[:c ds_provisi on][:openc ds][:vagra nt][:share d_folders] = []
	23	########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## #########