Made value in CommandInfo optional and added argv.

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


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

Branch: refs/heads/master
Commit: 038d83371c99a1741edca93f005573ade6041845
Parents: 13d8460
Author: Jie Yu <[email protected]>
Authored: Tue Aug 12 16:18:46 2014 -0700
Committer: Jie Yu <[email protected]>
Committed: Tue Aug 12 23:28:29 2014 -0700

----------------------------------------------------------------------
 include/mesos/mesos.proto | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/038d8337/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 226ddb4..dc781d1 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -231,8 +231,20 @@ message CommandInfo {
 
   optional Environment environment = 2;
 
-  // Actual command (i.e., 'echo hello world').
-  required string value = 3;
+  // Whether the command will be executed via shell (i.e., /bin/sh -c)
+  // or not. If it is set to true, the 'value' below will be used as
+  // the shell command. Otherwise, the command will be executed via
+  // execve using the specified 'argv' below.
+  optional bool shell = 6 [default = true];
+
+  // The shell command (i.e., 'echo hello world').
+  // NOTE: This field is changed from 'required' to 'optional' in
+  // 0.20.0. It will only cause issues if a new framework is
+  // connecting to an old master.
+  optional string value = 3;
+
+  // The argument list.
+  repeated string argv = 7;
 
   // Enables executor and tasks to run as a specific user. If the user
   // field is present both in FrameworkInfo and here, the CommandInfo

Reply via email to