ITS:f8385566e866321219bd6040dcecc090528035aa commitshttps://forge.etsi.org/rep/ITS/ITS/-/commits/f8385566e866321219bd6040dcecc090528035aa2014-11-20T10:05:57+00:00https://forge.etsi.org/rep/ITS/ITS/-/commit/f8385566e866321219bd6040dcecc090528035aaMerged revision(s) 1636-1833 from branches/STF484_VALIDATION2014-11-20T10:05:57+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/b725cbfe01ec813fb72daa79cb5fd23ece1ef2d0/!\ FIXING BRANCH/MERGE ISSUES /!\2014-11-20T09:47:04+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326Re-inserting lost file
https://forge.etsi.org/rep/ITS/ITS/-/commit/d11515b3d531110c02f04ec97d9dc0578722b10dMerged revision(s) 1474 from branches/Security/tct3_javasrc_patch.patch:2014-11-18T10:43:30+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326Merged revision(s) 1721-1722 from branches/Security/taconfig.xml:
https://forge.etsi.org/rep/ITS/ITS/-/commit/8211f688abd39b2a0579c44e75a1cda719cb69dbMerged branches/Security/unittests (r1488-1820) to trunk.2014-11-18T10:37:24+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/d8021f756973b84ca53e65c1db20628f263e43d5Merged branches/Security/ttcn (r1471-1819) to trunk.2014-11-18T10:22:33+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/b91fc291a8a918fc3ec7d7a47ba86888300b5429/!\ FIXING BRANCH/MERGE ISSUES /!\2014-11-18T10:05:45+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326Re-inserting lost changehttps://forge.etsi.org/rep/ITS/ITS/-/commit/40f6ab055d47e8862b7018cdbaa28a4a827b1c42/!\ FIXING BRANCH/MERGE ISSUES /!\2014-11-18T10:02:02+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326Re-inserting lost changehttps://forge.etsi.org/rep/ITS/ITS/-/commit/12336445180e41dc28bedb12c492349ed82b5d6d/!\ FIXING BRANCH/MERGE ISSUES /!\2014-11-18T09:56:46+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326Re-inserting lost changehttps://forge.etsi.org/rep/ITS/ITS/-/commit/9caa1af3ce2dff68429b75264999ab674b0a570cMerged branches/Security/t3plugins (r1425-1803) to trunk.2014-11-18T09:38:34+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/4a7a5d775cdfb13b880dcda28c11f7cea35eb767Merged branches/Security/javasrc (r1425-1803) to trunk.2014-11-18T09:18:17+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326This completes cleaning operation of r1821 by re-inserting non-STF455 specific changes in trunkhttps://forge.etsi.org/rep/ITS/ITS/-/commit/7c515cdbbf9d08fa98415665429663ada019bcc1/!\ FIXING BRANCH/MERGE ISSUES /!\2014-11-18T09:14:27+00:00bergeberge@5a941883-869f-0410-b6e7-a816b635d326Reverting non STF455-specific changes trunk/javasrc (r1427 - r1432).
Those changes:
- have been manually duplicated in Security branch, causing massive conflicts upon merging the branch back in trunk.
- will be re-inserted by merging Security branch back in trunk (cf. next commit)https://forge.etsi.org/rep/ITS/ITS/-/commit/bac556d6a59642320066cac938f0f5471d4a04ebMerge STF455 staff2014-06-03T08:29:27+00:00garciaygarciay@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/9920a2925f9e9e4cd1f9f453fbbf4dddfac11f39Merge STF455 staff2014-06-03T08:28:24+00:00garciaygarciay@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/e08f118d3cceb1f66f8422ccf662b0d3023d9e8eMerge STF455 staff2014-06-03T08:16:20+00:00garciaygarciay@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/bb81ca2e50f051880a7cd40c492ba827ec92084aMerge STF455 staff2014-06-03T08:15:31+00:00garciaygarciay@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/e40d126de9ccdd5ca3bf2d787fa377bfc15a8f45Merge STF455 staff2014-06-03T08:14:48+00:00garciaygarciay@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/e8ef5e9e185075a920d42811ece80dc7aa556386Merge STF455 staff2014-06-03T08:13:54+00:00garciaygarciay@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/dc910ff4750f71f0300c5b8e173297d07dd18233Merge STF455 staff2014-06-02T13:41:12+00:00garciaygarciay@5a941883-869f-0410-b6e7-a816b635d326https://forge.etsi.org/rep/ITS/ITS/-/commit/9fbe575bc455a541dfeb10a5453082906996076amerge branch STF462 to the trunk2014-05-22T13:59:50+00:00filatovfilatov@5a941883-869f-0410-b6e7-a816b635d326