Produced by Araxis Merge on 3/29/2017 4:53:20 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\apache_extensions | server_config.yml-PROD | Fri Mar 3 16:22:14 2017 UTC |
| 2 | CTT-DM CIF Submission.zip\code\apache_extensions | server_config.yml-PROD | Tue Mar 28 19:46:52 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 20 | 42 |
| Changed | 19 | 38 |
| 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_logo ut: https: // DNS . DNS /centrallo gin/centra llanding.a spx | |
| 3 | ||
| 4 | proxy_conf ig_root: | |
| 5 | apache_ur l_proxy: h ttps:// PORT . DNS / | |
| 6 | proxy_url s: | |
| 7 | - incoming _url_path: https:// PORT . DNS : PORT /nexus #th is is like our incom ing url | |
| 8 | proxy _location: /nexus/ | |
| 9 | - incoming _url_path: https:// DNS . DNS : PORT /jenkins/l ogin #this is like o ur incomin g url | |
| 10 | proxy _location: /jenkins | |
| 11 | - incoming _url_path: https:// DNS . DNS : PORT rails_pris me/ #this is like ou r incoming url | |
| 12 | proxy _location: /rails_pr isme/ | |
| 13 | - incoming _url_path: https:// DNS . DNS : PORT /rails_kom et_a/ #thi s is like our incomi ng url | |
| 14 | proxy _location: /1/rails_ komet_a/ | |
| 15 | - incoming _url_path: https:// DNS . DNS : PORT /rails_kom et_b/ | |
| 16 | proxy _location: /2/rails_ komet_b/ | |
| 17 | - incoming _url_path: https:// DNS . DNS : PORT /rails_kom et_c/ | |
| 18 | proxy _location: /3/rails_ komet_c/ | |
| 19 | - incoming _url_path: https:// DNS . DNS : PORT /rails_kom et_a/ #thi s is like our incomi ng url | |
| 20 | proxy _location: /4/rails_ komet_a/ | |
| 21 | - incoming _url_path: https:// DNS . DNS : PORT /rails_kom et_b/ #thi s is like our incomi ng url | |
| 22 | proxy _location: /5/rails_ komet_b/ | |
| 23 | - incoming _url_path: https:// DNS . DNS : PORT /rails_kom et_c/ #thi s is like our incomi ng url | |
| 24 | proxy _location: /6/rails_ komet_c/ | |
| 25 | - incoming _url_path: https:// DNS . DNS : PORT /manager/ #We play w ith this o ne | |
| 26 | proxy _location: /manager | |
| 27 | - incoming _url_path: https:// DNS . DNS : PORT /git/ #thi s is like our incomi ng url | |
| 28 | proxy _location: /git/ | |
| 29 | - incoming _url_path: https:// DNS . DNS : PORT /isaac-res t_1 | |
| 30 | proxy _location: /1/isaac- rest | |
| 31 | - incoming _url_path: https:// DNS . DNS : PORT /isaac-res t_2 | |
| 32 | proxy _location: /2/isaac- rest | |
| 33 | - incoming _url_path: https:// DNS . DNS : PORT /isaac-res t_3 | |
| 34 | proxy _location: /3/isaac- rest | |
| 35 | - incoming _url_path: https:// DNS . DNS : PORT /isaac-res t_1 | |
| 36 | proxy _location: /1/isaac- rest | |
| 37 | - incoming _url_path: https:// DNS . DNS : PORT /isaac-res t_2 | |
| 38 | proxy _location: /2/isaac- rest | |
| 39 | - incoming _url_path: https:// DNS . DNS : PORT /isaac-res t_3 | |
| 40 | proxy _location: /3/isaac- rest |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.