You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ka...@apache.org on 2016/02/27 05:34:35 UTC
mesos git commit: Fixed variable shadowing in
HookManager::slavePreLaunchDockerHook.
Repository: mesos
Updated Branches:
refs/heads/master 02c4dbda3 -> 95866a499
Fixed variable shadowing in HookManager::slavePreLaunchDockerHook.
Review: https://reviews.apache.org/r/43676/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/95866a49
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/95866a49
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/95866a49
Branch: refs/heads/master
Commit: 95866a4995a746c855414fec61e721c9eaf75561
Parents: 02c4dbd
Author: Kevin Devroede <ke...@gmail.com>
Authored: Fri Feb 26 23:28:17 2016 -0500
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Fri Feb 26 23:34:27 2016 -0500
----------------------------------------------------------------------
src/hook/manager.cpp | 4 ++--
src/hook/manager.hpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/95866a49/src/hook/manager.cpp
----------------------------------------------------------------------
diff --git a/src/hook/manager.cpp b/src/hook/manager.cpp
index 704b166..17a42f8 100644
--- a/src/hook/manager.cpp
+++ b/src/hook/manager.cpp
@@ -205,7 +205,7 @@ void HookManager::slavePreLaunchDockerHook(
const CommandInfo& commandInfo,
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
- const string& name,
+ const string& containerName,
const string& sandboxDirectory,
const string& mappedDirectory,
const Option<Resources>& resources,
@@ -219,7 +219,7 @@ void HookManager::slavePreLaunchDockerHook(
commandInfo,
taskInfo,
executorInfo,
- name,
+ containerName,
sandboxDirectory,
mappedDirectory,
resources,
http://git-wip-us.apache.org/repos/asf/mesos/blob/95866a49/src/hook/manager.hpp
----------------------------------------------------------------------
diff --git a/src/hook/manager.hpp b/src/hook/manager.hpp
index 8ab331a..3af28a7 100644
--- a/src/hook/manager.hpp
+++ b/src/hook/manager.hpp
@@ -59,7 +59,7 @@ public:
const CommandInfo& commandInfo,
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executorInfo,
- const std::string& name,
+ const std::string& containerName,
const std::string& sandboxDirectory,
const std::string& mappedDirectory,
const Option<Resources>& resources,