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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | chef-repo.zip\chef-repo\machine_cookbooks\chef-repo_provision\attributes | jenkins.rb | Thu Mar 23 16:44:18 2017 UTC |
| 2 | chef-repo.zip\chef-repo\machine_cookbooks\chef-repo_provision\attributes | jenkins.rb | Mon Oct 2 14:59:12 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 40 |
| Changed | 2 | 8 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 1 | # | |
| 2 | # Cookbook Name:: eh mp_provisi oner | |
| 3 | # Attribut es:: vista -kodak | |
| 4 | # | |
| 5 | ||
| 6 | default[:' chef-repo_ provision' ][:jenkins ][:copy_fi les] = {} | |
| 7 | ||
| 8 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 9 | # vista-ko dak specif ic aws con figuration options | |
| 10 | default[:' chef-repo_ provision' ][:jenkins ][:aws][:i nstance_ty pe] = ENV[ "JENKINS_I NSTANCE_TY PE"] || "m 3.medium" | |
| 11 | default[:' chef-repo_ provision' ][:jenkins ][:aws][:s ubnet] = " REDACTED " | |
| 12 | default[:' chef-repo_ provision' ][:jenkins ][:aws][:s sh_usernam e] = " REDACTED " | |
| 13 | default[:' chef-repo_ provision' ][:jenkins ][:aws][:s sh_keyname ] = " REDACTED " | |
| 14 | default[:' chef-repo_ provision' ][:jenkins ][:aws][:s sh_key_pat h] = "#{EN V['HOME']} /Projects/ vistacore/ .chef/keys /#{node[:' chef-repo_ provision' ][:jenkins ][:aws][:s sh_keyname ]}" | |
| 15 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 16 | ||
| 17 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 18 | # vista-ko dak specif ic vagrant configura tion optio ns | |
| 19 | default[:' chef-repo_ provision' ][:jenkins ][:vagrant ][:ip_addr ess] = " IP " | |
| 20 | default[:' chef-repo_ provision' ][:jenkins ][:vagrant ][:provide r_config] = {} | |
| 21 | default[:' chef-repo_ provision' ][:jenkins ][:vagrant ][:shared_ folders] = [] | |
| 22 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 23 | ||
| 24 | default[:' chef-repo_ provision' ][:jenkins ][:aws][:c opy_files] = {} |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.