You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2014/05/23 02:07:31 UTC
git commit: Fixed ExecutorInfo handover on the ExternalContainerizer
launch.
Repository: mesos
Updated Branches:
refs/heads/master ab41e9a21 -> 817f6a8a3
Fixed ExecutorInfo handover on the ExternalContainerizer launch.
see summary.
Review: https://reviews.apache.org/r/21683
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/817f6a8a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/817f6a8a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/817f6a8a
Branch: refs/heads/master
Commit: 817f6a8a36b28040e16ce80c52d6d311b75a2dce
Parents: ab41e9a
Author: Till Toenshoff <to...@me.com>
Authored: Fri May 23 02:05:43 2014 +0200
Committer: Till Toenshoff <to...@me.com>
Committed: Fri May 23 02:05:43 2014 +0200
----------------------------------------------------------------------
src/slave/containerizer/external_containerizer.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/817f6a8a/src/slave/containerizer/external_containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/external_containerizer.cpp b/src/slave/containerizer/external_containerizer.cpp
index f9811c4..b4fda11 100644
--- a/src/slave/containerizer/external_containerizer.cpp
+++ b/src/slave/containerizer/external_containerizer.cpp
@@ -414,9 +414,8 @@ Future<Nothing> ExternalContainerizerProcess::launch(
launch.mutable_container_id()->CopyFrom(containerId);
if (taskInfo.isSome()) {
launch.mutable_task_info()->CopyFrom(taskInfo.get());
- } else {
- launch.mutable_executor_info()->CopyFrom(executor);
}
+ launch.mutable_executor_info()->CopyFrom(executor);
launch.set_directory(directory);
if (user.isSome()) {
launch.set_user(user.get());