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 | slave.rb | Thu Mar 23 16:44:18 2017 UTC |
| 2 | chef-repo.zip\chef-repo\machine_cookbooks\chef-repo_provision\attributes | slave.rb | Mon Oct 2 14:59:34 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 22 |
| Changed | 1 | 6 |
| 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:: ch ef-repo_pr ovision | |
| 3 | # Attribut es:: slave | |
| 4 | # | |
| 5 | ||
| 6 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### | |
| 7 | # slave sp ecific aws configura tion optio ns | |
| 8 | default[:' chef-repo_ provision' ][:slave][ :jenkins_u rl] = "htt ps://ci.vi stacore.us " | |
| 9 | default[:' chef-repo_ provision' ][:slave][ :aws][:ins tance_type ] = "m3.xl arge" | |
| 10 | default[:' chef-repo_ provision' ][:slave][ :aws][:sub net] = " REDACTED " | |
| 11 | default[:' chef-repo_ provision' ][:slave][ :aws][:ssh _username] = " REDACTED " | |
| 12 | default[:' chef-repo_ provision' ][:slave][ :aws][:ssh _keyname] = " REDACTED " | |
| 13 | default[:' chef-repo_ provision' ][:slave][ :aws][:ssh _key_path] = "#{ENV[ 'HOME']}/P rojects/vi stacore/.c hef/keys/# {node[:'ch ef-repo_pr ovision'][ :slave][:a ws][:ssh_k eyname]}" | |
| 14 | ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ########## ######### |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.