You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/01/21 18:54:00 UTC

karaf-cellar git commit: Minor improvement on the hazelcast section of the user guide

Repository: karaf-cellar
Updated Branches:
  refs/heads/master 4285d4253 -> 15d29f5d8


Minor improvement on the hazelcast section of the user guide


Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/15d29f5d
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/15d29f5d
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/15d29f5d

Branch: refs/heads/master
Commit: 15d29f5d8736d05f176376745869d85bd4a72a36
Parents: 4285d42
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 21 18:53:41 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 21 18:53:41 2015 +0100

----------------------------------------------------------------------
 manual/src/main/webapp/user-guide/hazelcast.conf | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/15d29f5d/manual/src/main/webapp/user-guide/hazelcast.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/user-guide/hazelcast.conf b/manual/src/main/webapp/user-guide/hazelcast.conf
index 72613ce..55a6bb0 100644
--- a/manual/src/main/webapp/user-guide/hazelcast.conf
+++ b/manual/src/main/webapp/user-guide/hazelcast.conf
@@ -50,15 +50,27 @@ You can also use multicast (enabled by default in Cellar):
                 <multicast-group>224.2.2.3</multicast-group>
                 <multicast-port>54327</multicast-port>
             </multicast>
+            <tcp-ip enabled="false"/>
+            <aws enabled="false"/>
 {code}
 
 Instead of using multicast, you can also explicitly define the host names (or IP addresses) of the different
 Cellar nodes:
 
 {code}
+            <multicast enabled="false"/>
+            <tcp-ip enabled="true"/>
+            <aws enabled="false"/>
+{code}
+
+By default, it will bind to all interfaces on the node machine. It's possible to specify a interface:
+
+{code}
+            <multicast enabled="false"/>
             <tcp-ip enabled="true">
                 <interface>127.0.0.1</interface>
             </tcp-ip>
+            <aws enabled="false"/>
 {code}
 
 NB: in previous Hazelcast versions (especially the one used by Cellar 2.3.x), it was possible to have multicast and tcp-ip enabled in the same time.
@@ -68,6 +80,8 @@ If your network or network interface don't support multicast, you have to enable
 You can also discover nodes located on a Amazon instance:
 
 {code}
+            <multicast enabled="false"/>
+            <tcp-ip enabled="false"/>
             <aws enabled="true">
                 <access-key>my-access-key</access-key>
                 <secret-key>my-secret-key</secret-key>
@@ -82,7 +96,7 @@ You can also discover nodes located on a Amazon instance:
             </aws>
 {code}
 
-Third, you can specific on which network interface the cluster is running. By default, Hazelcast listens on all interfaces (0.0.0.0).
+Third, you can specific on which network interface the cluster is running (whatever the discovery mechanism used). By default, Hazelcast listens on all interfaces (0.0.0.0).
 But you can specify an interface:
 
 {code}