You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2017/07/11 01:39:22 UTC
[36/50] mesos git commit: Windows: Updated use of
`getSystemEnvironment` in containerizer.
Windows: Updated use of `getSystemEnvironment` in containerizer.
This function was moved to stout and renamed to
`get_system_env`.
Review: https://reviews.apache.org/r/60330/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3ec06c68
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3ec06c68
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3ec06c68
Branch: refs/heads/master
Commit: 3ec06c6816019b9681103178745b5b106efe8cce
Parents: 4b28a28
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Mon Jul 10 14:37:35 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Jul 10 17:15:37 2017 -0700
----------------------------------------------------------------------
src/slave/containerizer/docker.cpp | 2 +-
src/slave/containerizer/mesos/launch.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ec06c68/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 5cd3b6d..2fe9227 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -1427,7 +1427,7 @@ Future<pid_t> DockerContainerizerProcess::launchExecutorProcess(
// applications to not work, but upon overriding system defaults, it becomes
// the overidder's problem.
Option<map<std::wstring, std::wstring>> systemEnvironment =
- process::internal::getSystemEnvironment();
+ ::internal::windows::get_system_env();
foreachpair(const std::wstring& key,
const std::wstring& value,
systemEnvironment.get()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ec06c68/src/slave/containerizer/mesos/launch.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/launch.cpp b/src/slave/containerizer/mesos/launch.cpp
index 973b248..8e66293 100644
--- a/src/slave/containerizer/mesos/launch.cpp
+++ b/src/slave/containerizer/mesos/launch.cpp
@@ -711,7 +711,7 @@ int MesosContainerizerLaunch::execute()
// cause applications to not work, but upon overriding system defaults, it
// becomes the overidder's problem.
Option<std::map<std::wstring, std::wstring>> systemEnvironment =
- process::internal::getSystemEnvironment();
+ ::internal::windows::get_system_env();
foreachpair (const std::wstring& key,
const std::wstring& value,
systemEnvironment.get()) {