Produced by Araxis Merge on 7/6/2017 8:23:28 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\rails_prisme\lib\dbseeds | localhost.rb | Wed May 31 03:59:08 2017 UTC |
| 2 | OSCIF_CTT_v4_build 1.zip\rails_prisme\lib\dbseeds | localhost.rb | Mon Jul 3 23:34:26 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 6 | 78 |
| Changed | 5 | 12 |
| 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 | module See dData | |
| 2 | LOCALHOS T = [ | |
| 3 | { | |
| 4 | service: { name: 'Tom cat Applic ation Serv er', descr iption: 'T omcat Appl ication Se rver', ser vice_type: PrismeSer vice::TOMC AT}, | |
| 5 | props: [ | |
| 6 | {key: PrismeServ ice::CARGO _REMOTE_US ERNAME, va lue: 'devt est'}, | |
| 7 | {key: PrismeServ ice::CARGO _REMOTE_PA SSWORD, va lue: '["jK \x90\xA1\x 1Fk\x87\xB 6\xAB\xA3\ xC5\xE7~\x BA\x1AK", "k]\x95\xD 8w\x15\xFE \xD3\xC7\x DC\xAC\x9E \x1C\xD0bG "]'}, | |
| 8 | {key: Pris meService: :CARGO_REM OTE_URL, v alue: 'htt ps:// DNS : PORT r'} | |
| 9 | ] | |
| 10 | }, | |
| 11 | { | |
| 12 | service: { name: 'Tom cat Localh ost', desc ription: ' Tomcat Loc alhost', s ervice_typ e: PrismeS ervice::TO MCAT}, | |
| 13 | props: [ | |
| 14 | {key: PrismeServ ice::CARGO _REMOTE_US ERNAME, va lue: 'devt est'}, | |
| 15 | {key: PrismeServ ice::CARGO _REMOTE_PA SSWORD, va lue: '["jK \x90\xA1\x 1Fk\x87\xB 6\xAB\xA3\ xC5\xE7~\x BA\x1AK", "k]\x95\xD 8w\x15\xFE \xD3\xC7\x DC\xAC\x9E \x1C\xD0bG "]'}, | |
| 16 | {key: Pris meService: :CARGO_REM OTE_URL, v alue: 'htt p://localh ost: PORT /manager'} | |
| 17 | ] | |
| 18 | }, | |
| 19 | { | |
| 20 | service: { name: 'Nex us Artifac tory', des cription: 'Nexus Art ifactory', service_t ype: Prism eService:: NEXUS}, | |
| 21 | props: [ | |
| 22 | {key: Pris meService: :NEXUS_REP OSITORY_UR L, value: 'https:// DNS : PORT /content/g roups/ever ything/'}, | |
| 23 | {key: Pris meService: :NEXUS_PUB LICATION_U RL, value: 'https:// DNS : PORT /content/r epositorie s/termdata /'}, | |
| 24 | {key: PrismeServ ice::NEXUS _USER, val ue: 'devte st'}, | |
| 25 | {key: PrismeServ ice::NEXUS _PWD, valu e: '["jK\x 90\xA1\x1F k\x87\xD7\ xC3\xD8\xA 8\x9A\x18\ xD4fC"]'} | |
| 26 | ] | |
| 27 | }, | |
| 28 | { | |
| 29 | service: { name: 'GIT ', descrip tion: 'GIT Version C ontrol', s ervice_typ e: PrismeS ervice::GI T}, | |
| 30 | props: [ | |
| 31 | {key: Pris meService: :GIT_ROOT, value: 'h ttps:// DNS : PORT /'}, | |
| 32 | {key: PrismeServ ice::GIT_U SER, value : 'devtest '}, | |
| 33 | {key: PrismeServ ice::GIT_P WD, value: '["jK\x90 \xA1\x1Fk\ x87\xD7\xC 3\xD8\xA8\ x9A\x18\xD 4fC"]'} | |
| 34 | ] | |
| 35 | }, | |
| 36 | { | |
| 37 | service: { name: 'Jen kins Build Server', descriptio n: 'Jenkin s Build Se rver', ser vice_type: PrismeSer vice::JENK INS}, | |
| 38 | props: [ | |
| 39 | {key: Pris meService: :JENKINS_R OOT, value : 'https:/ / DNS : PORT '}, | |
| 40 | {key: PrismeServ ice::JENKI NS_USER, v alue: 'dev test'}, | |
| 41 | {key: PrismeServ ice::JENKI NS_PWD, va lue: '["jK \x90\xA1\x 1Fk\x87\xB 6\xAB\xA3\ xC5\xE7~\x BA\x1AK", "k]\x95\xD 8w\x15\xFE \xD3\xC7\x DC\xAC\x9E \x1C\xD0bG "]'} | |
| 42 | ] | |
| 43 | } | |
| 44 | ] | |
| 45 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.