diff options
| author | Erlang/OTP <[email protected]> | 2010-12-16 14:34:26 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-12-16 14:34:26 +0100 |
| commit | 15daa43c1d5b953b28c998b30d39cec9ab2514b4 (patch) | |
| tree | 4652579a41503cbc86ec0719d227015367a0a540 /lib/orber/doc | |
| parent | 73205a499c16781ecd064ec2446d502b3c0d01b6 (diff) | |
| parent | e10e306098b6f331ec683147e34a4a745900c144 (diff) | |
| download | otp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.tar.gz otp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.tar.bz2 otp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.zip | |
Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r14
* nick/orber/old_ssl_option/OTP-8994:
The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this.
Conflicts:
lib/orber/doc/src/notes.xml
lib/orber/vsn.mk
Diffstat (limited to 'lib/orber/doc')
| -rw-r--r-- | lib/orber/doc/src/notes.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml index 1e2cdd05ba..4ac74a4873 100644 --- a/lib/orber/doc/src/notes.xml +++ b/lib/orber/doc/src/notes.xml @@ -34,13 +34,12 @@ <section> <title>Orber 3.6.19</title> - <section> <title>Improvements and New Features</title> <list type="bulleted"> <item> <p> - Partial support for recursive structs and unions. + Partial support for recursive structs and unions. Only available for the erl_corba backend and requires that Light IFR is used. I.e. the IC option {light_ifr, true} and that Orber is configured in such a way that Light IFR @@ -56,7 +55,7 @@ <item> <p>The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this.</p> - <p>Own Id: OTP-8994 Aux Id:seq11747</p> + <p>Own Id: OTP-8994 Aux Id: seq11747</p> </item> </list> </section> |