You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/03/15 03:13:33 UTC
mesos git commit: Fixed whitespace style in mesos.proto files.
Repository: mesos
Updated Branches:
refs/heads/master e431ed944 -> 21d8fe7b2
Fixed whitespace style in mesos.proto files.
Review: https://reviews.apache.org/r/44626/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/21d8fe7b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/21d8fe7b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/21d8fe7b
Branch: refs/heads/master
Commit: 21d8fe7b2ba006ea77183259b0153faa23a36f79
Parents: e431ed9
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Mon Mar 14 19:13:06 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Mon Mar 14 19:13:06 2016 -0700
----------------------------------------------------------------------
include/mesos/mesos.proto | 10 ++++++++++
include/mesos/v1/mesos.proto | 9 +++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/21d8fe7b/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 56d456a..d6ba7e7 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -413,10 +413,12 @@ message ExecutorInfo {
required ExecutorID executor_id = 1;
optional FrameworkID framework_id = 8; // TODO(benh): Make this required.
required CommandInfo command = 7;
+
// Executor provided with a container will launch the container
// with the executor's CommandInfo and we expect the container to
// act as a Mesos executor.
optional ContainerInfo container = 11;
+
repeated Resource resources = 5;
optional string name = 9;
@@ -491,6 +493,7 @@ message SlaveInfo {
repeated Resource resources = 3;
repeated Attribute attributes = 5;
optional SlaveID id = 6;
+
// TODO(joerg84): Remove checkpoint field after deprecation cycle starting
// with 0.27 (MESOS-2317).
optional bool checkpoint = 7 [default = false];
@@ -1192,10 +1195,13 @@ message TaskInfo {
repeated Resource resources = 4;
optional ExecutorInfo executor = 5;
optional CommandInfo command = 7;
+
// Task provided with a container will launch the container as part
// of this task paired with the task's CommandInfo.
optional ContainerInfo container = 9;
+
optional bytes data = 6;
+
// A health check for the task (currently in *alpha* and initial
// support will only be for TaskInfo's that have a CommandInfo).
optional HealthCheck health_check = 8;
@@ -1735,15 +1741,19 @@ message Label {
message Port {
// Port number on which the framework exposes a service.
required uint32 number = 1;
+
// Name of the service hosted on this port.
optional string name = 2;
+
// Layer 4-7 protocol on which the framework exposes its services.
optional string protocol = 3;
+
// This field restricts discovery within a framework (FRAMEWORK),
// within a Mesos cluster (CLUSTER), or places no restrictions (EXTERNAL).
// The visibility setting for a Port overrides the general visibility setting
// in the DiscoveryInfo.
optional DiscoveryInfo.Visibility visibility = 4;
+
// This can be used to decorate the message with metadata to be
// interpreted by external applications such as firewalls.
optional Labels labels = 5;
http://git-wip-us.apache.org/repos/asf/mesos/blob/21d8fe7b/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 4fba774..ac6adfb 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -413,10 +413,12 @@ message ExecutorInfo {
required ExecutorID executor_id = 1;
optional FrameworkID framework_id = 8; // TODO(benh): Make this required.
required CommandInfo command = 7;
+
// Executor provided with a container will launch the container
// with the executor's CommandInfo and we expect the container to
// act as a Mesos executor.
optional ContainerInfo container = 11;
+
repeated Resource resources = 5;
optional string name = 9;
@@ -1189,10 +1191,13 @@ message TaskInfo {
repeated Resource resources = 4;
optional ExecutorInfo executor = 5;
optional CommandInfo command = 7;
+
// Task provided with a container will launch the container as part
// of this task paired with the task's CommandInfo.
optional ContainerInfo container = 9;
+
optional bytes data = 6;
+
// A health check for the task (currently in *alpha* and initial
// support will only be for TaskInfo's that have a CommandInfo).
optional HealthCheck health_check = 8;
@@ -1732,15 +1737,19 @@ message Label {
message Port {
// Port number on which the framework exposes a service.
required uint32 number = 1;
+
// Name of the service hosted on this port.
optional string name = 2;
+
// Layer 4-7 protocol on which the framework exposes its services.
optional string protocol = 3;
+
// This field restricts discovery within a framework (FRAMEWORK),
// within a Mesos cluster (CLUSTER), or places no restrictions (EXTERNAL).
// The visibility setting for a Port overrides the general visibility setting
// in the DiscoveryInfo.
optional DiscoveryInfo.Visibility visibility = 4;
+
// This can be used to decorate the message with metadata to be
// interpreted by external applications such as firewalls.
optional Labels labels = 5;