[
https://issues.apache.org/jira/browse/DERBY-2108?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12472607
]
Dyre Tjeldvoll commented on DERBY-2108:
---------------------------------------
The changes look good, but did you try to build after creating the latest
version of the patch? It seems to me that the latest version contains conflicts:
[EMAIL PROTECTED] egrep '\<\<\<|\>\>\>' /tmp/derby-2108-v4.diff
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
+<<<<<<< .mine
+>>>>>>> .r506910
Seems rev 506910 introduced some changes that weren't compatible with yours.
> Implement SSL/TLS communication between client and server
> ---------------------------------------------------------
>
> Key: DERBY-2108
> URL: https://issues.apache.org/jira/browse/DERBY-2108
> Project: Derby
> Issue Type: New Feature
> Components: Network Client, Network Server
> Reporter: Bernt M. Johnsen
> Assigned To: Bernt M. Johnsen
> Fix For: 10.3.0.0
>
> Attachments: DERBY-2108-first-cut.diff, DERBY-2108-first-cut.stat,
> DERBY-2108-second-cut.diff, DERBY-2108-second-cut.stat,
> DERBY-2108-third-cut.diff, DERBY-2108-third-cut.stat, derby-2108-v1.diff,
> derby-2108-v1.stat, derby-2108-v2.diff, derby-2108-v2.diff,
> derby-2108-v2.stat, derby-2108-v3.diff, derby-2108-v3.stat,
> derby-2108-v4.diff, derby-2108-v4.stat, SSLFuncSpect.txt
>
>
> Implement SSL/TLS communication between client and server
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
