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 2017/03/16 03:09:57 UTC
mesos git commit: Fixed a compile error in CNI isolator.
Repository: mesos
Updated Branches:
refs/heads/master 83d1f9c1b -> e89575580
Fixed a compile error in CNI isolator.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e8957558
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e8957558
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e8957558
Branch: refs/heads/master
Commit: e895755804e51cfb80dd0091a9208df5926070a0
Parents: 83d1f9c
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Mar 15 20:09:47 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Mar 15 20:09:47 2017 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/network/cni/cni.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e8957558/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 ea12aa0..392c391 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
@@ -28,6 +28,7 @@
#include <stout/net.hpp>
#include <stout/os.hpp>
#include <stout/path.hpp>
+#include <stout/strings.hpp>
#include "common/protobuf_utils.hpp"
@@ -997,7 +998,7 @@ Future<Nothing> NetworkCniIsolatorProcess::_isolate(
<< containerId << ", using host '/etc/resolv.conf'";
} else {
LOG(INFO) << "DNS nameservers for container " << containerId
- << " are " << dns.nameservers();
+ << " are: " << strings::join(", ", dns.nameservers());
write = os::write(resolvPath, cni::spec::formatResolverConfig(dns));
if (write.isError()) {