aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2011-05-20 14:34:11 +0200
committerNiclas Eklund <[email protected]>2011-05-20 14:34:11 +0200
commit6c6ea3ebe1e031520bf5bf8808c595b935a4b3bc (patch)
treedd1394ddbb714ae6290862fb6f90c44370c748ff
parent001e7d1b861bcf4f7a26d7d267ca906ed7b48516 (diff)
parentf31df159185ebf108d2ac79352f8a3f8c1eecb66 (diff)
downloadotp-6c6ea3ebe1e031520bf5bf8808c595b935a4b3bc.tar.gz
otp-6c6ea3ebe1e031520bf5bf8808c595b935a4b3bc.tar.bz2
otp-6c6ea3ebe1e031520bf5bf8808c595b935a4b3bc.zip
Merge branch 'nick/orber/dialyzer_warnings/OTP-9326' into dev
* nick/orber/dialyzer_warnings/OTP-9326: OTP-9326 Eliminated Dialyzer warnings.
-rw-r--r--lib/orber/doc/src/notes.xml16
-rw-r--r--lib/orber/src/orber.erl2
-rw-r--r--lib/orber/vsn.mk2
3 files changed, 18 insertions, 2 deletions
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 589123ef73..231872f958 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -33,6 +33,22 @@
</header>
<section>
+ <title>Orber 3.6.21</title>
+
+ <section>
+ <title>Improvements and New Features</title>
+ <list type="bulleted">
+ <item>
+ <p>
+ Eliminated Dialyzer warnings.</p>
+ <p>
+ Own Id: OTP-9326 Aux Id:</p>
+ </item>
+ </list>
+ </section>
+ </section>
+
+ <section>
<title>Orber 3.6.20</title>
<section>
diff --git a/lib/orber/src/orber.erl b/lib/orber/src/orber.erl
index 665b3cb383..386c07d227 100644
--- a/lib/orber/src/orber.erl
+++ b/lib/orber/src/orber.erl
@@ -245,7 +245,7 @@ create_nodes(Host, N, Port, Options, Errors, NodeData) ->
create_node(Host, Port, Options) ->
- case slave:start_link(Host, Port) of
+ case slave:start_link(Host, list_to_atom(integer_to_list(Port))) of
{ok, NewNode} ->
case net_adm:ping(NewNode) of
pong ->
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 5f17cda229..35aabd51cd 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,3 +1,3 @@
-ORBER_VSN = 3.6.20
+ORBER_VSN = 3.6.21