Produced by Araxis Merge on 3/29/2017 4:53:05 PM 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 | CTT-DM CIF Submission.zip\code\aitc_install\configs\prismeData | server_config.yml-PRE | Fri Mar 3 16:22:17 2017 UTC |
| 2 | CTT-DM CIF Submission.zip\code\aitc_install\configs\prismeData | server_config.yml-PRE | Mon Mar 27 20:10:41 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 11 | 68 |
| Changed | 10 | 20 |
| 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 | ||
| 3 | # This nee ds to be d efined wit h the PRE PROD logof f URL for SSOi | |
| 4 | ssoi_logou t: https:/ / AI . DNS . DNS /centrallo gin/centra llanding.a spx | |
| 5 | ||
| 6 | ||
| 7 | ||
| 8 | proxy_conf ig_root: | |
| 9 | ||
| 10 | apache_url _proxy: ht tps:// DNS . DNS / | |
| 11 | ||
| 12 | proxy_ur ls: | |
| 13 | ||
| 14 | - incoming _url_path: https:// DNS . DNS : PORT /nexus #th is is like our incom ing url | |
| 15 | ||
| 16 | prox y_location : /nexus/ | |
| 17 | ||
| 18 | - incoming _url_path: https:// DNS . DNS : PORT /login #th is is like our incom ing url | |
| 19 | ||
| 20 | prox y_location : /jenkins | |
| 21 | ||
| 22 | - incoming _url_path: https:// DNS . DNS : PORT /rails_pri sme/ #this is like o ur incomin g url | |
| 23 | ||
| 24 | prox y_location : /rails_p risme/ | |
| 25 | ||
| 26 | - incoming _url_path: https:// DNS . DNS : PORT /rails_kom et_a/ #thi s is like our incomi ng url | |
| 27 | ||
| 28 | prox y_location : /rails_k omet_a/ | |
| 29 | ||
| 30 | - incoming _url_path: https:// DNS . DNS : PORT /rails_kom et_b/ | |
| 31 | ||
| 32 | prox y_location : /rails_k omet_b/ | |
| 33 | ||
| 34 | - incoming _url_path: https:// DNS . DNS : PORT /manager/ #We play w ith this o ne | |
| 35 | ||
| 36 | prox y_location : /manager | |
| 37 | ||
| 38 | - incoming _url_path: https:// DNS . DNS : PORT /git/ #thi s is like our incomi ng url | |
| 39 | ||
| 40 | prox y_location : /git/ | |
| 41 | ||
| 42 | - incoming _url_path: https:// DNS . DNS : PORT /isaac-res t | |
| 43 | ||
| 44 | prox y_location : /isaac-r est |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.