You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/25 23:36:28 UTC
[47/48] mesos git commit: Fixed variable shadowing in
HookManager::slavePreLaunchDockerHook.
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/c04f33c6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c04f33c6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c04f33c6
Branch: refs/heads/0.27.x
Commit: c04f33c6fdd198dec974e61cf943bd8650b23f30
Parents: 6744167
Author: Kevin Devroede <ke...@gmail.com>
Authored: Fri Feb 26 23:28:17 2016 -0500
Committer: Michael Park <mp...@apache.org>
Committed: Fri Feb 26 20:36:24 2016 -0800
----------------------------------------------------------------------
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/c04f33c6/src/hook/manager.cpp
----------------------------------------------------------------------
diff --git a/src/hook/manager.cpp b/src/hook/manager.cpp
index 6ee9303..92be376 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/c04f33c6/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,