You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/01/06 23:46:47 UTC
[2/3] mesos git commit: Revert "Cleaned up VIP comments."
Revert "Cleaned up VIP comments."
This reverts commit 8f4688c660f851375bae8e2cd92e1c4b62751655.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/79d74961
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/79d74961
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/79d74961
Branch: refs/heads/master
Commit: 79d74961c941591dcc77df496f6f05310b1d3de6
Parents: 05e6818
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Jan 6 14:46:01 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jan 6 14:46:01 2016 -0800
----------------------------------------------------------------------
include/mesos/mesos.proto | 13 +++++++------
include/mesos/v1/mesos.proto | 13 +++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/79d74961/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 158e087..72166ef 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -1554,9 +1554,10 @@ message Port {
// This can be used to decorate the message with metadata to be
// interpreted by external applications such as firewalls.
optional Labels labels = 5;
- // The backend port on which the task is running. This could be different than
- // the `number` field (1), e.g. when an agent achieves network isolation
- // between containers using port (layer 4) segregation.
+ // This field represents the backend port on which the task is
+ // running. It could potentially be different than the `number` field (1), for
+ // instance, when an agent achieves network isolation between containers using
+ // port (layer 4) segregation.
optional uint32 instance_port = 6;
}
@@ -1573,9 +1574,9 @@ message Ports {
* An IP address.
*/
message IPAddress {
- // TODO(asridharan): We skip tag number 1 in case we later want to be binary
- // compatible with `NetworkInfo.IPAddress`. See MESOS-4243 for more details.
- // optional Protocol protocol = 1;
+ // TODO (asridharan): We are setting the positional identifier of this
+ // field to 2, in order to maintain backward compatibility with the `IPAddress`
+ // message definition within `NetworkInfo`. See MESOS-4243 for more details.
optional string ip_address = 2;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/79d74961/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index c6c5a81..a287683 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -1553,9 +1553,10 @@ message Port {
// This can be used to decorate the message with metadata to be
// interpreted by external applications such as firewalls.
optional Labels labels = 5;
- // The backend port on which the task is running. This could be different than
- // the `number` field (1), e.g. when an agent achieves network isolation
- // between containers using port (layer 4) segregation.
+ // This field represents the backend port on which the task is
+ // running. It could potentially be different than the `number` field (1), for
+ // instance, when an agent achieves network isolation between containers using
+ // port (layer 4) segregation.
optional uint32 instance_port = 6;
}
@@ -1572,9 +1573,9 @@ message Ports {
* An IP address.
*/
message IPAddress {
- // TODO(asridharan): We skip tag number 1 in case we later want to be binary
- // compatible with `NetworkInfo.IPAddress`. See MESOS-4243 for more details.
- // optional Protocol protocol = 1;
+ // TODO (asridharan): We are setting the positional identifier of this
+ // field to 2, in order to maintain backward compatibility with the `IPAddress`
+ // message definition within `NetworkInfo`. See MESOS-4243 for more details.
optional string ip_address = 2;
}