Produced by Araxis Merge on 10/2/2017 1:40:10 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\project_cookbooks\mocks\templates\default\jlv | appconfig-development.properties.erb | Fri Jul 1 16:58:43 2016 UTC |
| 2 | chef-repo.zip\chef-repo\project_cookbooks\mocks\templates\default\jlv | appconfig-development.properties.erb | Mon Oct 2 15:16:38 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 36 |
| Changed | 3 | 8 |
| 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 | grails.jme adowsURL = <%= jmead ows[:jmead ows][:appl ication][: protocol]% >://<%= jm eadows[:jm eadows][:i paddress]% ><%= jmead ows[:jmead ows][:appl ication][: path]%>?<% = jmeadows [:jmeadows ][:applica tion][:pat h_query]%> | |
| 2 | #http:// IP /jMeadows/ JMeadowsDa taService? wsdl | |
| 3 | ||
| 4 | grails.jme adowsUsern ame = REDACTED | |
| 5 | grails.jme adowsPassw ord = REDA C TED | |
| 6 | ||
| 7 | grails.sma rtCardBypa ss = true | |
| 8 | grails.tes tSmartCard = REDACTED | |
| 9 | grails.isE ncryptedTo kenDebug = false | |
| 10 | grails.tru stAllSSLHo stnamesAnd Certs = fa lse | |
| 11 | ||
| 12 | connection TimeoutMS = 45000 | |
| 13 | requestTim eoutMS = 1 00000 | |
| 14 | ||
| 15 | grails.ext Lib = ext- 3.4.0 | |
| 16 | ||
| 17 | #grails to mcat plugi n 2 way SS L connecto r configur ations | |
| 18 | grails.ena bleTomcatP lugin2WayS SL = false | |
| 19 | grails.tom catPlugin2 WaySSLKeys toreFile = C:\\glass fish\\doma ins\\domai n1\\config \\keystore .jks | |
| 20 | grails.tom catPlugin2 WaySSLKeys torePass = changeit | |
| 21 | grails.tom catPlugin2 WaySSLTrus tstoreFile = C:\\gla ssfish\\do mains\\dom ain1\\conf ig\\jsseca certs | |
| 22 | grails.tom catPlugin2 WaySSLTrus tstorePass = changei t |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.