Repository: mesos Updated Branches: refs/heads/master a925b77d5 -> c92f88c6f
MESOS-3002: Fix getOrElse compilation error for network isolator. Review: https://reviews.apache.org/r/36277 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c92f88c6 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c92f88c6 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c92f88c6 Branch: refs/heads/master Commit: c92f88c6f84f506051f77c34a565a8bb799fadec Parents: a925b77 Author: Joris Van Remoortere <[email protected]> Authored: Tue Jul 7 14:51:04 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Tue Jul 7 14:51:13 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/isolators/network/port_mapping.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c92f88c6/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 2ef79eb..a7757f2 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -1100,7 +1100,7 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags) } Try<Resources> resources = Resources::parse( - flags.resources.get(""), + flags.resources.getOrElse(""), flags.default_role); if (resources.isError()) {
