You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/02/23 04:06:35 UTC
[3/3] mesos git commit: Updated comments/docs for using reservation
endpoints without principal.
Updated comments/docs for using reservation endpoints without principal.
Review: https://reviews.apache.org/r/43642/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/866c52c5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/866c52c5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/866c52c5
Branch: refs/heads/master
Commit: 866c52c51366da5998db879bbf55ecc278d2c6f2
Parents: a6d27b1
Author: Greg Mann <gr...@mesosphere.io>
Authored: Mon Feb 22 17:21:38 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Mon Feb 22 19:06:05 2016 -0800
----------------------------------------------------------------------
docs/reservation.md | 4 +---
include/mesos/mesos.proto | 6 +-----
include/mesos/v1/mesos.proto | 6 +-----
3 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/866c52c5/docs/reservation.md
----------------------------------------------------------------------
diff --git a/docs/reservation.md b/docs/reservation.md
index 41321d4..b98ebe6 100644
--- a/docs/reservation.md
+++ b/docs/reservation.md
@@ -58,9 +58,7 @@ see the [authorization documentation](authorization.md).
* `/reserve` and `/unreserve` HTTP endpoints allow __operators__ to manage
dynamic reservations through the master. Operators may currently reserve
resources for any role, although this
- [will change](https://issues.apache.org/jira/browse/MESOS-4591). NOTE: As of
- 0.27.0, these endpoints cannot be used when HTTP authentication is disabled
- due to the current implementation. This will change in version 0.28.0.
+ [will change](https://issues.apache.org/jira/browse/MESOS-4591).
In the following sections, we will walk through examples of each of the
interfaces described above.
http://git-wip-us.apache.org/repos/asf/mesos/blob/866c52c5/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 11a71cb..33f6b08 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -586,16 +586,12 @@ message Resource {
// NOTE: We currently do not allow frameworks with role "*" to
// make dynamic reservations.
- // This field indicates the principal of the framework or operator
+ // Indicates the principal, if any, of the framework or operator
// that reserved this resource. If reserved by a framework, the
// field should match the `FrameworkInfo.principal`. It is used in
// conjunction with the `UnreserveResources` ACL to determine
// whether the entity attempting to unreserve this resource is
// permitted to do so.
- //
- // NOTE: Currently, a principal is required in order to reserve
- // resources, so the master disallows any reserve operations
- // without a principal. This constraint will be removed in 0.28.
optional string principal = 1;
// Labels are free-form key value pairs that can be used to
http://git-wip-us.apache.org/repos/asf/mesos/blob/866c52c5/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 84e933e..46dbec6 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -583,16 +583,12 @@ message Resource {
// NOTE: We currently do not allow frameworks with role "*" to
// make dynamic reservations.
- // This field indicates the principal of the framework or operator
+ // Indicates the principal, if any, of the framework or operator
// that reserved this resource. If reserved by a framework, the
// field should match the `FrameworkInfo.principal`. It is used in
// conjunction with the `UnreserveResources` ACL to determine
// whether the entity attempting to unreserve this resource is
// permitted to do so.
- //
- // NOTE: Currently, a principal is required in order to reserve
- // resources, so the master disallows any reserve operations
- // without a principal. This constraint will be removed in 0.28.
optional string principal = 1;
// Labels are free-form key value pairs that can be used to