Produced by Araxis Merge on 3/29/2017 4:53:40 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\rails_prisme\lib\dbseeds | aitc_test_db.rb | Fri Mar 3 16:22:10 2017 UTC |
| 2 | CTT-DM CIF Submission.zip\code\rails_prisme\lib\dbseeds | aitc_test_db.rb | Wed Mar 29 19:31:34 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 6 | 80 |
| 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 | AITC_TEST = [ | |
| 3 | { | |
| 4 | s ervice: {n ame: 'Tomc at Applica tion Serve r 1', desc ription: ' Tomcat App lication S erver', se rvice_type : PrismeSe rvice::TOM CAT}, | |
| 5 | p rops: [ | |
| 6 | {key: P rismeServi ce::CARGO_ REMOTE_USE RNAME, val ue: 'devte st'}, | |
| 7 | {key: P rismeServi ce::CARGO_ REMOTE_PAS SWORD, val ue: '["jK\ x90\xA1\x1 Fk\x87\xB6 \xAB\xA3\x C5\xE7~\xB A\x1AK", " k]\x95\xD8 w\x15\xFE\ xD3\xC7\xD C\xAC\x9E\ x1C\xD0bG" ]'}, | |
| 8 | {key: Pris meService: :CARGO_REM OTE_URL, v alue: 'htt ps:// DNS . DNS : PORT /manager'} | |
| 9 | ] | |
| 10 | }, | |
| 11 | { | |
| 12 | s ervice: {n ame: 'Tomc at Applica tion Serve r 2', desc ription: ' Tomcat App lication S erver', se rvice_type : PrismeSe rvice::TOM CAT}, | |
| 13 | p rops: [ | |
| 14 | {key: P rismeServi ce::CARGO_ REMOTE_USE RNAME, val ue: 'devte st'}, | |
| 15 | {key: P rismeServi ce::CARGO_ REMOTE_PAS SWORD, val ue: '["jK\ x90\xA1\x1 Fk\x87\xB6 \xAB\xA3\x C5\xE7~\xB A\x1AK", " k]\x95\xD8 w\x15\xFE\ xD3\xC7\xD C\xAC\x9E\ x1C\xD0bG" ]'}, | |
| 16 | {key: Pris meService: :CARGO_REM OTE_URL, v alue: 'htt ps:// DNS . DNS : PORT /manager'} | |
| 17 | ] | |
| 18 | }, | |
| 19 | { | |
| 20 | s ervice: {n ame: 'Nexu s Artifact ory', desc ription: ' Nexus Arti factory', service_ty pe: Prisme Service::N EXUS}, | |
| 21 | p rops: [ | |
| 22 | {key: Pris meService: :NEXUS_REP OSITORY_UR L, value: 'https:// DNS . DNS : PORT /nexus/con tent/group s/public'} , | |
| 23 | {key: Pris meService: :NEXUS_PUB LICATION_U RL, value: 'https:// DNS . DNS : PORT /nexus/con tent/repos itories/te rmdata/'}, | |
| 24 | {key: P rismeServi ce::NEXUS_ USER, valu e: 'devtes t'}, | |
| 25 | {key: P rismeServi ce::NEXUS_ PWD, value : '["jK\x9 0\xA1\x1Fk \x87\xB6\x AB\xA3\xC5 \xE7~\xBA\ x1AK", "k] \x95\xD8w\ x15\xFE\xD 3\xC7\xDC\ xAC\x9E\x1 C\xD0bG"]' } | |
| 26 | ] | |
| 27 | }, | |
| 28 | { | |
| 29 | s ervice: {n ame: 'GIT' , descript ion: 'GIT Version Co ntrol', se rvice_type : PrismeSe rvice::GIT }, | |
| 30 | p rops: [ | |
| 31 | {key: Pris meService: :GIT_ROOT, value: 'h ttps:// DNS . DNS : PORT /git/'}, | |
| 32 | {key: P rismeServi ce::GIT_US ER, value: 'devtest' }, | |
| 33 | {key: P rismeServi ce::GIT_PW D, value: '["jK\x90\ xA1\x1Fk\x 87\xB6\xAB \xA3\xC5\x E7~\xBA\x1 AK", "k]\x 95\xD8w\x1 5\xFE\xD3\ xC7\xDC\xA C\x9E\x1C\ xD0bG"]'} | |
| 34 | ] | |
| 35 | }, | |
| 36 | { | |
| 37 | s ervice: {n ame: 'Jenk ins Build Server', d escription : 'Jenkins Build Ser ver', serv ice_type: PrismeServ ice::JENKI NS}, | |
| 38 | p rops: [ | |
| 39 | {key: Pris meService: :JENKINS_R OOT, value : 'https:/ / DNS c. DNS : PORT /jenkins'} , | |
| 40 | {key: P rismeServi ce::JENKIN S_USER, va lue: 'devt est'}, | |
| 41 | {key: P rismeServi ce::JENKIN S_PWD, val ue: '["jK\ x90\xA1\x1 Fk\x87\xB6 \xAB\xA3\x C5\xE7~\xB A\x1AK", " k]\x95\xD8 w\x15\xFE\ xD3\xC7\xD C\xAC\x9E\ x1C\xD0bG" ]'} | |
| 42 | ] | |
| 43 | } | |
| 44 | ] | |
| 45 | ||
| 46 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.