[4/4] mesos git commit: Added new ContainerLaunchInfo task_environment.

[ti...@apache.org]

Added new ContainerLaunchInfo task_environment.

Review: https://reviews.apache.org/r/58923/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c1e04ca9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c1e04ca9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c1e04ca9

Branch: refs/heads/1.3.x
Commit: c1e04ca97186d3b2edb73e32d7facbb6a35462aa
Parents: bbdd207
Author: Till Toenshoff <to...@me.com>
Authored: Mon May 8 22:59:29 2017 +0200
Committer: Till Toenshoff <to...@me.com>
Committed: Mon May 8 23:57:31 2017 +0200

----------------------------------------------------------------------
 include/mesos/slave/containerizer.proto | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/c1e04ca9/include/mesos/slave/containerizer.proto
----------------------------------------------------------------------
diff --git a/include/mesos/slave/containerizer.proto b/include/mesos/slave/containerizer.proto
index c30b1fc..41f2905 100644
--- a/include/mesos/slave/containerizer.proto
+++ b/include/mesos/slave/containerizer.proto
@@ -161,6 +161,8 @@ message ContainerLaunchInfo {
   // The additional preparation commands to execute before
   // executing the command.
   repeated CommandInfo pre_exec_commands = 1;
+
+  // The environment set for the container.
   optional Environment environment = 2;
 
   // (Linux only) The root filesystem for the container.
@@ -196,6 +198,12 @@ message ContainerLaunchInfo {
 
   // (POSIX only) The slave path of the pseudo terminal.
   optional string tty_slave_path = 14;
+
+  // The environment specific for command tasks. Gets merged with
+  // 'environment' and the 'command' `Environment`.
+  // TODO(tillt): Remove this once we no longer support the old style
+  // command task (i.e., that uses mesos-execute).
+  optional Environment task_environment = 15;
 }