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:48 UTC
[3/3] mesos git commit: Revert "Added repeated vip to DiscoveryInfo
and instance_port to Port."
Revert "Added repeated vip to DiscoveryInfo and instance_port to Port."
This reverts commit b87e42a2b141722f4048b999bea18d5b7b2b8a47.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cbd23b88
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cbd23b88
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cbd23b88
Branch: refs/heads/master
Commit: cbd23b886f14b5c75455e98d18fe8e41a01852c1
Parents: 79d7496
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Jan 6 14:46:02 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jan 6 14:46:02 2016 -0800
----------------------------------------------------------------------
include/mesos/mesos.proto | 29 -----------------------------
include/mesos/v1/mesos.proto | 29 -----------------------------
2 files changed, 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cbd23b88/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 72166ef..2431fdd 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -1554,11 +1554,6 @@ 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;
- // 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;
}
@@ -1571,25 +1566,6 @@ message Ports {
/**
- * An IP address.
- */
-message IPAddress {
- // 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;
-}
-
-
-/**
- * Holds information about a virtual IP.
- */
-message VIPInfo {
- required IPAddress vip = 1;
-}
-
-
-/**
* Service discovery information.
* The visibility field restricts discovery within a framework (FRAMEWORK),
* within a Mesos cluster (CLUSTER), or places no restrictions (EXTERNAL).
@@ -1617,11 +1593,6 @@ message DiscoveryInfo {
optional string version = 5;
optional Ports ports = 6;
optional Labels labels = 7;
- // The virtual IP is used as a single endpoint to represent multiple instances
- // of a given service. An application might need multiple virtual IPs if it
- // exposes multiple services, or if the same service is exposed on different
- // virtual IPs.
- repeated VIPInfo vips = 8;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/cbd23b88/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index a287683..4aed098 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -1553,11 +1553,6 @@ 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;
- // 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;
}
@@ -1570,25 +1565,6 @@ message Ports {
/**
- * An IP address.
- */
-message IPAddress {
- // 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;
-}
-
-
-/**
- * Holds information about a virtual IP.
- */
-message VIPInfo {
- required IPAddress vip = 1;
-}
-
-
-/**
* Service discovery information.
* The visibility field restricts discovery within a framework (FRAMEWORK),
* within a Mesos cluster (CLUSTER), or places no restrictions (EXTERNAL).
@@ -1616,9 +1592,4 @@ message DiscoveryInfo {
optional string version = 5;
optional Ports ports = 6;
optional Labels labels = 7;
- // The virtual IP is used as a single endpoint to represent multiple instances
- // of a given service. An application might need multiple virtual IPs if it
- // exposes multiple services, or if the same service is exposed on different
- // virtual IPs.
- repeated VIPInfo vips = 8;
}