mesos git commit: Added Labels field of FrameworkInfo into v1 mesos.proto.

[me...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master ddaa556dd -> bf72ab6f7


Added Labels field of FrameworkInfo into v1 mesos.proto.

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


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

Branch: refs/heads/master
Commit: bf72ab6f7ebe285be2a02b6473ab3f1dde3fb9e9
Parents: ddaa556
Author: Qian Zhang <zh...@cn.ibm.com>
Authored: Mon Sep 14 23:49:36 2015 -0700
Committer: Adam B <ad...@mesosphere.io>
Committed: Mon Sep 14 23:51:18 2015 -0700

----------------------------------------------------------------------
 include/mesos/v1/mesos.proto | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/bf72ab6f/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index fdd678b..bcce340 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -280,6 +280,11 @@ message FrameworkInfo {
   // capabilities (e.g., ability to receive offers for revocable
   // resources).
   repeated Capability capabilities = 10;
+
+  // Labels are free-form key value pairs supplied by the framework
+  // scheduler (e.g., to describe additional functionality offered by
+  // the framework). These labels are not interpreted by Mesos itself.
+  optional Labels labels = 11;
 }