Produced by Araxis Merge on 6/23/2017 11:57:02 AM Eastern 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 | OSCIF_CTT_v4_build 1 code..zip\rails_prisme\config | server_config.yml | Wed May 31 03:59:08 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1 code.zip\rails_prisme\config | server_config.yml | Fri Jun 23 05:55:39 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 21 | 44 |
| Changed | 20 | 40 |
| 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 | applicatio n_urls: | |
| 2 | ssoi_log out: https ://URL.DNS | |
| 3 | ||
| 4 | proxy_conf ig_root: | |
| 5 | apache_url _proxy: ht tps:// URL . DNS / | |
| 6 | proxy_ur ls: | |
| 7 | - incoming _url_path: https:// URL . DNS : PORT #this is like our i ncoming ur l | |
| 8 | prox y_location : /nexus | |
| 9 | - incoming _url_path: https:// URL . DNS : PORT #this is like our i ncoming ur l | |
| 10 | prox y_location : /jenkins | |
| 11 | - incoming _url_path: URL . DNS : PORT #this is like our i ncoming ur l | |
| 12 | prox y_location : /prisme/ | |
| 13 | - incoming _url_path: https:// URL . DNS : PORT #this is like our i ncoming ur l | |
| 14 | prox y_location : /komet/ | |
| 15 | - incoming _url_path: https:// URL . DNS : PORT #We play with this one | |
| 16 | prox y_location : /manager | |
| 17 | - incoming _url_path: https:// DNS : PORT /git/ #thi s is like our incomi ng url | |
| 18 | prox y_location : /git/ | |
| 19 | - incoming _url_path: https:// DNS : PORT /isaac-res t-1 | |
| 20 | prox y_location : /isaac-r est-1 | |
| 21 | - incoming _url_path: https:// DNS : PORT /isaac-res t-2 | |
| 22 | prox y_location : /isaac-r est-2 | |
| 23 | - incoming _url_path: https:// DNS : PORT /isaac-res t-3 | |
| 24 | prox y_location : /isaac-r est-3 | |
| 25 | - incoming _url_path: https:// DNS : PORT /isaac-res t-4 | |
| 26 | prox y_location : /isaac-r est-4 | |
| 27 | - incoming _url_path: https:// DNS : PORT /komet_a | |
| 28 | prox y_location : /1/komet _a | |
| 29 | - incoming _url_path: http://lo calhost: PORT /isaac-res t-billy_go at-local | |
| 30 | prox y_location : /2/isaac -rest | |
| 31 | - incoming _url_path: https:// URL . DNS : PORT | |
| 32 | prox y_location : /1/isaac -rest | |
| 33 | - incoming _url_path: https:// URL . DNS : PORT | |
| 34 | prox y_location : /2/isaac -rest | |
| 35 | - incoming _url_path: http://lo calhost: PORT /isaac-res t-freddy_c at-local | |
| 36 | prox y_location : /3/isaac -rest | |
| 37 | - incoming _url_path: http://lo calhost: PORT /rails_kom et_a | |
| 38 | prox y_location : /3/rails _komet_a | |
| 39 | - incoming _url_path: http://lo calhost: PORT /rails_kom et_b | |
| 40 | prox y_location : /3/rails _komet_b | |
| 41 | - incoming _url_path: http://lo calhost: PORT /rails_pri sme | |
| 42 | prox y_location : /3/rails _prisme_b |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.