Repository: mesos Updated Branches: refs/heads/master 0b9e6e67c -> f855fb7f2
Add missing argument for prepare() in network isolator. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f855fb7f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f855fb7f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f855fb7f Branch: refs/heads/master Commit: f855fb7f21552e9d44ec5ab4f6afaf51f1944dc4 Parents: 0b9e6e6 Author: Ian Downes <[email protected]> Authored: Mon Jun 1 15:29:19 2015 -0700 Committer: Ian Downes <[email protected]> Committed: Mon Jun 1 15:29:54 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/isolators/network/port_mapping.cpp | 1 + src/slave/containerizer/isolators/network/port_mapping.hpp | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/f855fb7f/src/slave/containerizer/isolators/network/port_mapping.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/port_mapping.cpp b/src/slave/containerizer/isolators/network/port_mapping.cpp index 843e52d..d3c1918 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -1795,6 +1795,7 @@ Future<Option<CommandInfo>> PortMappingIsolatorProcess::prepare( const ContainerID& containerId, const ExecutorInfo& executorInfo, const string& directory, + const Option<string>& rootfs, const Option<string>& user) { if (unmanaged.contains(containerId)) { http://git-wip-us.apache.org/repos/asf/mesos/blob/f855fb7f/src/slave/containerizer/isolators/network/port_mapping.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/port_mapping.hpp b/src/slave/containerizer/isolators/network/port_mapping.hpp index 6579286..52c7e7c 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.hpp +++ b/src/slave/containerizer/isolators/network/port_mapping.hpp @@ -162,6 +162,7 @@ public: const ContainerID& containerId, const ExecutorInfo& executorInfo, const std::string& directory, + const Option<std::string>& rootfs, const Option<std::string>& user); virtual process::Future<Nothing> isolate(
