diff options
| author | Erlang/OTP <[email protected]> | 2010-10-27 13:42:58 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-10-27 13:42:58 +0200 |
| commit | f3c06ffe91fba511d83b1a88986651d4c2c6483c (patch) | |
| tree | b4acd3d34b414b02ba98f0a92776ce1efd879e95 /lib/orber/vsn.mk | |
| parent | 489be05ffa13d66726b3c5d61227294aa1dad992 (diff) | |
| parent | 4a249009a3944383ff16a4610ee4aa5538c9b156 (diff) | |
| download | otp-f3c06ffe91fba511d83b1a88986651d4c2c6483c.tar.gz otp-f3c06ffe91fba511d83b1a88986651d4c2c6483c.tar.bz2 otp-f3c06ffe91fba511d83b1a88986651d4c2c6483c.zip | |
Merge branch 'nick/orber/corbaloc_http/OTP-8900' into maint-r13
* nick/orber/corbaloc_http/OTP-8900:
Incorrect TR tag.
A corbaloc http string could return an EXIT message, instead of a system exception, if the HTTP server closed the socket without returning a complete message. I.e. header and a body containing a stringified IOR.
Diffstat (limited to 'lib/orber/vsn.mk')
| -rw-r--r-- | lib/orber/vsn.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk index d074bfb86c..c405326e9a 100644 --- a/lib/orber/vsn.mk +++ b/lib/orber/vsn.mk @@ -1,7 +1,14 @@ -ORBER_VSN = 3.6.15 +ORBER_VSN = 3.6.18 -TICKETS = OTP-8353 \ +TICKETS = OTP-8900 + +TICKETS_3.6.17 = OTP-8840 + +TICKETS_3.6.16 = OTP-8543 \ + OTP-8489 + +TICKETS_3.6.15 = OTP-8353 \ OTP-8354 \ OTP-8374 \ OTP-8409 \ @@ -9,6 +16,8 @@ TICKETS = OTP-8353 \ TICKETS_3.6.14 = OTP-8201 +TICKETS_3.6.14 = OTP-8201 + TICKETS_3.6.13 = OTP-7987 TICKETS_3.6.12 = OTP-7906 |