Repository: mesos Updated Branches: refs/heads/master 2075a9807 -> abe9d1b4a
Documented the content of the `SlaveInfo.resources` field. Review: https://reviews.apache.org/r/60404 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6b543494 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6b543494 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6b543494 Branch: refs/heads/master Commit: 6b543494f53a467a6aeb702fb0850cb7d66cc4cd Parents: 2075a98 Author: Neil Conway <neil.con...@gmail.com> Authored: Fri Jun 23 15:48:23 2017 -0700 Committer: Neil Conway <neil.con...@gmail.com> Committed: Sat Jun 24 20:57:03 2017 -0700 ---------------------------------------------------------------------- include/mesos/mesos.proto | 5 +++++ include/mesos/v1/mesos.proto | 5 +++++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6b543494/include/mesos/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index 38449da..3338349 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -810,7 +810,12 @@ message MasterInfo { message SlaveInfo { required string hostname = 1; optional int32 port = 8 [default = 5051]; + + // The configured resources at the agent. This does not include any + // dynamic reservations or persistent volumes that may currently + // exist at the agent. repeated Resource resources = 3; + repeated Attribute attributes = 5; optional SlaveID id = 6; http://git-wip-us.apache.org/repos/asf/mesos/blob/6b543494/include/mesos/v1/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto index 81eca47..6f0ad71 100644 --- a/include/mesos/v1/mesos.proto +++ b/include/mesos/v1/mesos.proto @@ -810,7 +810,12 @@ message MasterInfo { message AgentInfo { required string hostname = 1; optional int32 port = 8 [default = 5051]; + + // The configured resources at the agent. This does not include any + // dynamic reservations or persistent volumes that may currently + // exist at the agent. repeated Resource resources = 3; + repeated Attribute attributes = 5; optional AgentID id = 6;
