You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ya...@apache.org on 2017/08/30 18:29:52 UTC
mesos git commit: Removed an unused function argument.
Repository: mesos
Updated Branches:
refs/heads/master f7ab29936 -> 6148bd99a
Removed an unused function argument.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6148bd99
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6148bd99
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6148bd99
Branch: refs/heads/master
Commit: 6148bd99abc20810efc7c59d45d64bdd58478065
Parents: f7ab299
Author: Jiang Yan Xu <xu...@apple.com>
Authored: Tue Aug 29 17:45:04 2017 -0700
Committer: Jiang Yan Xu <xu...@apple.com>
Committed: Wed Aug 30 11:29:31 2017 -0700
----------------------------------------------------------------------
src/master/master.cpp | 5 ++---
src/master/master.hpp | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6148bd99/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 3a1515e..e08d377 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -6210,7 +6210,7 @@ void Master::_reregisterSlave(
// Inform the agent of the master's version of its checkpointed
// resources and the new framework pids for its tasks.
- ___reregisterSlave(slave, tasks, frameworks);
+ ___reregisterSlave(slave, frameworks);
slaves.reregistering.erase(slaveInfo.id());
return;
@@ -6505,7 +6505,7 @@ void Master::__reregisterSlave(
}
}
- ___reregisterSlave(slave, tasks, frameworks);
+ ___reregisterSlave(slave, frameworks);
slaves.reregistering.erase(slaveInfo.id());
}
@@ -6513,7 +6513,6 @@ void Master::__reregisterSlave(
void Master::___reregisterSlave(
Slave* slave,
- const vector<Task>& tasks,
const vector<FrameworkInfo>& frameworks)
{
CHECK_NOTNULL(slave);
http://git-wip-us.apache.org/repos/asf/mesos/blob/6148bd99/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index d7c67d0..f8aabb4 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -611,7 +611,6 @@ protected:
void ___reregisterSlave(
Slave* slave,
- const std::vector<Task>& tasks,
const std::vector<FrameworkInfo>& frameworks);
// 'future' is the future returned by the authenticator.