Produced by Araxis Merge on 7/6/2017 8:22:22 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 | OSCIF_CTT_v4_build 1.zip\apache_extensions | server_config.yml-SQA | Wed May 31 03:59:20 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1.zip\apache_extensions | server_config.yml-SQA | Mon Jul 3 20:56:41 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 16 | 32 |
| Changed | 15 | 31 |
| 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: //AI | ||
| 3 | proxy_conf ig_root: | ||
| 4 | apache_ur l_proxy: h ttps:// DNS | ||
| 5 | proxy_url s: | ||
| 6 | - incoming _url_path: https:// DNS : PORT #this is like our i ncoming ur l | ||
| 7 | proxy _location: /nexus/ | ||
| 8 | - incoming _url_path: https:// DNS : PORT #this is like our i ncoming ur l | ||
| 9 | proxy _location: /jenkins | ||
| 10 | - incoming _url_path: https:// DNS : PORT /rails_pri sme/ #this is like o ur incomin g url | ||
| 11 | proxy _location: /rails_pr isme/ | ||
| 12 | - incoming _url_path: https:// DNS : PORT /rails_kom et_a/ #thi s is like our incomi ng url | ||
| 13 | proxy _location: /1/rails_ komet_a/ | ||
| 14 | - incoming _url_path: https:// DNS : PORT /rails_kom et_b/ | ||
| 15 | proxy _location: /2/rails_ komet_b/ | ||
| 16 | - incoming _url_path: https:// DNS : PORT /rails_kom et_a/ #thi s is like our incomi ng url | ||
| 17 | proxy _location: /3/rails_ komet_a/ | ||
| 18 | - incoming _url_path: https:// DNS : PORT /rails_kom et_b/ | ||
| 19 | proxy _location: /4/rails_ komet_b/ | ||
| 20 | - incoming _url_path: https:// DNS : PORT /manager/ #We play w ith this o ne | ||
| 21 | proxy _location: /manager | ||
| 22 | - incoming _url_path: https:// DNS : PORT /git/ #thi s is like our incomi ng url | ||
| 23 | proxy _location: /git/ | ||
| 24 | - incoming _url_path: https:// DNS : PORT /isaac-res t_1 | ||
| 25 | proxy _location: /1/isaac- rest | ||
| 26 | - incoming _url_path: https:// DNS : PORT /isaac-res t_2 | ||
| 27 | proxy _location: /2/isaac- rest | ||
| 28 | - incoming _url_path: https:// DNS : PORT /isaac-res t_1 | ||
| 29 | proxy _location: /3/isaac- rest | ||
| 30 | - incoming _url_path: https:// DNS : PORT /isaac-res t_2 | ||
| 31 | proxy _location: /4/isaac- rest |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.