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/07/07 23:13:03 UTC
mesos git commit: Fixed a merge error for MESOS-7703.
Repository: mesos
Updated Branches:
refs/heads/1.1.x 197ada4e8 -> c167f7f02
Fixed a merge error for MESOS-7703.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c167f7f0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c167f7f0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c167f7f0
Branch: refs/heads/1.1.x
Commit: c167f7f028d7811dd2dc1aa9d8b44b924c7c2da8
Parents: 197ada4
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Jul 7 16:12:55 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Jul 7 16:12:55 2017 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/launch.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c167f7f0/src/slave/containerizer/mesos/launch.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/launch.cpp b/src/slave/containerizer/mesos/launch.cpp
index ae26072..d26fc59 100644
--- a/src/slave/containerizer/mesos/launch.cpp
+++ b/src/slave/containerizer/mesos/launch.cpp
@@ -706,10 +706,10 @@ int MesosContainerizerLaunch::execute()
// TODO(aaron.wood): 'os::which' current does not work on Windows.
// Remove the ifndef guard once it's supported on Windows.
if (!path::absolute(executable) &&
- launchInfo.has_working_directory()) {
+ flags.working_directory.isSome()) {
Option<string> which = os::which(
executable,
- launchInfo.working_directory());
+ flags.working_directory.get());
if (which.isSome()) {
executable = which.get();