Repository: mesos Updated Branches: refs/heads/master ea46a7070 -> 9075ad652
Fixed mesos-style.py errors. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9075ad65 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9075ad65 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9075ad65 Branch: refs/heads/master Commit: 9075ad6526d0b4e0e268f3df120a480fb6c21d4f Parents: ea46a70 Author: Jiang Yan Xu <y...@jxu.me> Authored: Wed Aug 6 16:21:55 2014 -0700 Committer: Jiang Yan Xu <y...@jxu.me> Committed: Wed Aug 6 16:25:48 2014 -0700 ---------------------------------------------------------------------- src/master/hierarchical_allocator_process.hpp | 8 ++++---- src/master/master.cpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/9075ad65/src/master/hierarchical_allocator_process.hpp ---------------------------------------------------------------------- diff --git a/src/master/hierarchical_allocator_process.hpp b/src/master/hierarchical_allocator_process.hpp index c7e689e..d81082f 100644 --- a/src/master/hierarchical_allocator_process.hpp +++ b/src/master/hierarchical_allocator_process.hpp @@ -576,12 +576,12 @@ HierarchicalAllocatorProcess<RoleSorter, FrameworkSorter>::resourcesRecovered( seconds_ = Duration::create(filters.get().refuse_seconds()); if (seconds_.isError()) { LOG(WARNING) << "Using the default value of 'refuse_seconds' to create " - << "the refused resources filter because the input value is " - << "invalid: " << seconds_.error(); + << "the refused resources filter because the input value " + << "is invalid: " << seconds_.error(); } else if (seconds_.get() < Duration::zero()) { LOG(WARNING) << "Using the default value of 'refuse_seconds' to create " - << "the refused resources filter because the input value is " - << "negative"; + << "the refused resources filter because the input value " + << "is negative"; } else { seconds = seconds_.get(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/9075ad65/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index a925a93..97e4340 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -2410,7 +2410,8 @@ void Master::_launchTasks( if (unusedResources.allocatable().size() > 0) { // Tell the allocator about the unused (e.g., refused) resources. - allocator->resourcesRecovered(frameworkId, slaveId, unusedResources, filters); + allocator->resourcesRecovered( + frameworkId, slaveId, unusedResources, filters); } }
