You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/04/27 20:12:00 UTC
mesos git commit: Fixed if-clause indentation in
"mesos/containerizer.cpp".
Repository: mesos
Updated Branches:
refs/heads/master fd163c20c -> 61823d33f
Fixed if-clause indentation in "mesos/containerizer.cpp".
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/61823d33
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/61823d33
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/61823d33
Branch: refs/heads/master
Commit: 61823d33fce0a79a67db3ff29bbfff2e565fbf76
Parents: fd163c2
Author: Alexander Rukletsov <al...@apache.org>
Authored: Thu Apr 27 20:29:54 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Apr 27 22:11:00 2017 +0200
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/61823d33/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 56db7eb..b58baed 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -1392,7 +1392,7 @@ Future<bool> MesosContainerizerProcess::_launch(
// TODO(klueska): Remove the check below once we have a good way of
// setting the sandbox directory for DEBUG containers.
if (!container->config.has_container_class() ||
- container->config.container_class() != ContainerClass::DEBUG) {
+ container->config.container_class() != ContainerClass::DEBUG) {
// TODO(jieyu): Consider moving this to filesystem isolator.
//
// NOTE: For the command executor case, although it uses the host
@@ -1419,8 +1419,7 @@ Future<bool> MesosContainerizerProcess::_launch(
// NOTE: Command task is a special case. Even if the container
// config has a root filesystem, the executor container still uses
// the host filesystem.
- if (!container->config.has_task_info() &&
- container->config.has_rootfs()) {
+ if (!container->config.has_task_info() && container->config.has_rootfs()) {
launchInfo.set_rootfs(container->config.rootfs());
}