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 2016/10/18 04:54:20 UTC
mesos git commit: Fixed a comment and some style issues in
`network/cni` isolator.
Repository: mesos
Updated Branches:
refs/heads/master 1091d4719 -> 757319357
Fixed a comment and some style issues in `network/cni` isolator.
Review: https://reviews.apache.org/r/52970/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/75731935
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/75731935
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/75731935
Branch: refs/heads/master
Commit: 757319357471227c0a1e906076eae8f9aa2fdbd6
Parents: 1091d47
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Mon Oct 17 21:54:14 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Oct 17 21:54:14 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/network/cni/cni.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/75731935/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
index ae78c65..c87e671 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
@@ -1223,7 +1223,7 @@ Future<Nothing> NetworkCniIsolatorProcess::_attach(
if (parse.isError()) {
return Failure(
"Failed to parse the output of the CNI plugin '" +
- plugin + "' :" + parse.error());
+ plugin + "': " + parse.error());
}
if (parse.get().has_ip4()) {
@@ -1480,8 +1480,6 @@ Future<Nothing> NetworkCniIsolatorProcess::detach(
<< "' to detach container " << containerId << " from network '"
<< networkName << "'";
- // NOTE: For 'DEL' the CNI plugin is not expected to return any
- // result, hence setting the STDOUT to /dev/null.
Try<Subprocess> s = subprocess(
plugin.get(),
{networkConfig.config.type()},