Repository: mesos Updated Branches: refs/heads/master 3fea995d9 -> cc1e9b77a
Renamed `info` to `executorInfo` in `Master::Http::_getExecutors`. Review: https://reviews.apache.org/r/49865/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cc1e9b77 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cc1e9b77 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cc1e9b77 Branch: refs/heads/master Commit: cc1e9b77a0cfe23240037407a7caefb1868e5ab7 Parents: 3fea995 Author: haosdent huang <haosd...@gmail.com> Authored: Mon Jul 11 17:27:20 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Mon Jul 11 17:27:37 2016 -0700 ---------------------------------------------------------------------- src/master/http.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/cc1e9b77/src/master/http.cpp ---------------------------------------------------------------------- diff --git a/src/master/http.cpp b/src/master/http.cpp index 42ba364..d1fe22b 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -1568,10 +1568,10 @@ mesos::master::Response::GetExecutors Master::Http::_getExecutors( foreachpair (const SlaveID& slaveId, const auto& executorsMap, framework->executors) { - foreachvalue (const ExecutorInfo& info, executorsMap) { + foreachvalue (const ExecutorInfo& executorInfo, executorsMap) { // Skip unauthorized executors. if (!approveViewExecutorInfo(executorsApprover, - info, + executorInfo, framework->info)) { continue; } @@ -1579,7 +1579,7 @@ mesos::master::Response::GetExecutors Master::Http::_getExecutors( mesos::master::Response::GetExecutors::Executor* executor = getExecutors.add_executors(); - executor->mutable_executor_info()->CopyFrom(info); + executor->mutable_executor_info()->CopyFrom(executorInfo); executor->mutable_slave_id()->CopyFrom(slaveId); } } @@ -1591,7 +1591,7 @@ mesos::master::Response::GetExecutors Master::Http::_getExecutors( foreachpair (const FrameworkID& frameworkId, const ExecutorMap& executors, slave->executors) { - foreachvalue (const ExecutorInfo& info, executors) { + foreachvalue (const ExecutorInfo& executorInfo, executors) { if (!master->frameworks.registered.contains(frameworkId)) { // TODO(haosdent): This logic should be simplified after // a deprecation cycle starting with 1.0 as after that @@ -1607,7 +1607,7 @@ mesos::master::Response::GetExecutors Master::Http::_getExecutors( (!master->frameworks.recovered.contains(frameworkId) || !approveViewExecutorInfo( executorsApprover, - info, + executorInfo, master->frameworks.recovered[frameworkId]))) { continue; } @@ -1615,7 +1615,7 @@ mesos::master::Response::GetExecutors Master::Http::_getExecutors( mesos::master::Response::GetExecutors::Executor* executor = getExecutors.add_orphan_executors(); - executor->mutable_executor_info()->CopyFrom(info); + executor->mutable_executor_info()->CopyFrom(executorInfo); executor->mutable_slave_id()->CopyFrom(slave->id); } }
