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 2015/11/25 06:01:37 UTC
mesos git commit: Renamed `remaining` to `required` in the
`Master::Http::_operation` interface.
Repository: mesos
Updated Branches:
refs/heads/master 92e536675 -> c884d937d
Renamed `remaining` to `required` in the `Master::Http::_operation` interface.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c884d937
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c884d937
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c884d937
Branch: refs/heads/master
Commit: c884d937d92d78f5c779fced6d887bdcc20492a2
Parents: 92e5366
Author: Michael Park <mp...@apache.org>
Authored: Tue Nov 24 20:28:13 2015 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Tue Nov 24 21:01:19 2015 -0800
----------------------------------------------------------------------
src/master/master.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c884d937/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index e5e0ed0..35f5169 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -1018,7 +1018,7 @@ private:
/**
* Continuation for operations: /reserve, /unreserve, /create and
- * /destroy. First tries to recover 'remaining' amount of
+ * /destroy. First tries to recover 'required' amount of
* resources by rescinding outstanding offers, then tries to apply
* the operation by calling 'master->apply' and propagates the
* 'Future<Nothing>' as 'Future<Response>' where 'Nothing' -> 'OK'
@@ -1026,7 +1026,7 @@ private:
*
* @param slaveId The ID of the slave that the operation is
* updating.
- * @param remaining The resources needed to satisfy the operation.
+ * @param required The resources needed to satisfy the operation.
* This is used for an optimization where we try to only
* rescind offers that would contribute to satisfying the
* operation.
@@ -1036,7 +1036,7 @@ private:
*/
process::Future<process::http::Response> _operation(
const SlaveID& slaveId,
- Resources remaining,
+ Resources required,
const Offer::Operation& operation) const;
Master* master;