[1/2] mesos git commit: Fixed a broken link to CNI repo.

[ji...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 5d2989b0e -> 6b9a78a6a


Fixed a broken link to CNI repo.

Review: https://reviews.apache.org/r/50769/


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

Branch: refs/heads/master
Commit: caf3deebcf49690337377838cd4ad88f5d320c66
Parents: 5d2989b
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Thu Aug 11 13:18:41 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Aug 11 13:18:41 2016 -0700

----------------------------------------------------------------------
 docs/networking.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/caf3deeb/docs/networking.md
----------------------------------------------------------------------
diff --git a/docs/networking.md b/docs/networking.md
index f6652f5..e278c3b 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -18,8 +18,7 @@ provide IP-per-container support allowing containers to be attached to
 different types of IP networks.  However, the two container run time
 engines differ in the way IP-per-container support is implemented. The
 `MesosContainerizer` uses the `network/cni` isolator to implement the
-[Container Network Interface
-(CNI)](https://github.com/containernetworking/cni/blob/master/SPEC.md)
+[Container Network Interface (CNI)](https://github.com/containernetworking/cni/blob/master/SPEC.md)
 to provide networking support for Mesos containers, while the
 `DockerContainerizer` relies on the Docker daemon to provide
 networking support using Docker's [Container Network

[2/2] mesos git commit: Removed a limitation in CNI doc.

[ji...@apache.org]

Removed a limitation in CNI doc.

Review: https://reviews.apache.org/r/50940/


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

Branch: refs/heads/master
Commit: 6b9a78a6a153d3739eaeafe0d51a7d52cb88c7b0
Parents: caf3dee
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Thu Aug 11 13:18:45 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Aug 11 13:19:28 2016 -0700

----------------------------------------------------------------------
 docs/cni.md | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/6b9a78a6/docs/cni.md
----------------------------------------------------------------------
diff --git a/docs/cni.md b/docs/cni.md
index 7cceca5..d74b355 100644
--- a/docs/cni.md
+++ b/docs/cni.md
@@ -381,35 +381,13 @@ documentation](https://www.weave.works/docs/net/latest/cni-plugin/)
 
 ### <a name="limitations"></a>Limitations
 
-Although the CNI specification caters to a broad set of network
-technologies the specification still has the following open questions:
-
-* If the IP address of the container is not routeable from outside the
-host, how do users (frameworks) expose TCP/UDP ports for services
-running on their container?
-* What should be the behavior of containers when the CNI configuration
-of the network, on which the containers were launched, is modified or
-deleted?
-
-Given the unspecified nature of these answers, in the current release
-we not aiming to address these questions. Accordingly there are two
-limitations to the `network/cni` isolator:
-
-* Currently the `network/cni` isolator does not provide any
-port mapping capabilities. Therefore if operators are running services
-on networks that are not addressable from outside the Agent host, the
-operators will need to run proxies/gateways for the services on the
-host network to direct traffic to their services.
-* Currently, if the CNI configuration that was used to launch a
-container is deleted or modified, while the container is still
-operational, while it will not hamper the operation of the container,
-the user might encounter errors when the container is deleted, which
-could potentially lead to leakage of resources (IP addresses).
-
-In future releases we plan to address both these limitations.
-[MESOS-4823](https://issues.apache.org/jira/browse/MESOS-4823) is
-tracking the development of port-mapping functionality for the
-`network/cni` isolator and
-[MESOS-5310](https://issues.apache.org/jira/browse/MESOS-5310) is
-tracking the progress of adding the ability to modify and delete CNI
-configuration without affecting container orchestration.
+Currently the `network/cni` isolator does not provide any port mapping
+capabilities. Therefore if operators are running services on networks
+that are not addressable from outside the Agent host, the operators
+will need to run proxies/gateways for the services on the host network
+to direct traffic to their services. We plan to address this
+limitation by having a CNI plugin, within the Mesos repository, that
+provides port mapping functionality and can be used with any other CNI
+plugin, such as the CNI bridge plugin. We are tracking this effort
+through
+[MESOS-6014](https://issues.apache.org/jira/browse/MESOS-6014).