You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2018/03/26 16:50:36 UTC

mesos git commit: Made network addition docs consistent.

Repository: mesos
Updated Branches:
  refs/heads/master ebe92c9b3 -> 008e0682c


Made network addition docs consistent.

Remove the mention of dynamic CNI network addition since 3 paragraphs
earlier it is stated explicitly that it is not supported without agent
restart.

Also remove a space before a period.

This closes #276


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/008e0682
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/008e0682
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/008e0682

Branch: refs/heads/master
Commit: 008e0682c6e29ce8565e9435315f7e186625d6a5
Parents: ebe92c9
Author: Marcin Owsiany <ma...@owsiany.pl>
Authored: Mon Mar 26 09:48:30 2018 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Mar 26 09:49:29 2018 -0700

----------------------------------------------------------------------
 docs/cni.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/008e0682/docs/cni.md
----------------------------------------------------------------------
diff --git a/docs/cni.md b/docs/cni.md
index c45ce27..72eb467 100644
--- a/docs/cni.md
+++ b/docs/cni.md
@@ -106,8 +106,8 @@ isolator) will not affect container orchestration.
 #### <a name="adding-modifying-deleting"></a>Adding/Deleting/Modifying CNI networks
 
 The `network/cni` isolator learns about all the CNI networks by
-reading the CNI configuration specified in `--network_cni_config_dir`
-. Hence, if the operator wants to add a CNI network, the corresponding
+reading the CNI configuration specified in `--network_cni_config_dir`.
+Hence, if the operator wants to add a CNI network, the corresponding
 configuration needs to be added to `--network_cni_config_dir`.
 
 While the `network/cni` isolator learns the CNI networks by reading
@@ -127,13 +127,13 @@ destroyed, even if the CNI configuration is deleted.
 The fact that the `network/cni` isolator always reads the CNI
 configurations from the disk allows the operator to dynamically add,
 modify and delete CNI configurations without the need to restart the
-agent. Whenever the operator adds a new CNI configuration, or modifies
-an existing CNI configuration, the agent will pick up this new CNI
-configuration when the next container is launched on that specific CNI
-network. Similarly when the operator deletes a CNI network the
-`network/cni` isolator will "unlearn" the CNI network (since it will
-have a reference to this CNI network when it started) in case a
-framework tries to launch a container on the deleted CNI network.
+agent. Whenever the operator modifies an existing CNI configuration,
+the agent will pick up this new CNI configuration when the next
+container is launched on that specific CNI network. Similarly when the
+operator deletes a CNI network the `network/cni` isolator will
+"unlearn" the CNI network (since it will have a reference to this CNI
+network when it started) in case a framework tries to launch a
+container on the deleted CNI network.
 
 #### <a name="attaching-containers-to-cni-networks"></a>Attaching containers to CNI networks