You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2015/06/10 23:21:53 UTC
mesos git commit: Fixed whitespace errors.
Repository: mesos
Updated Branches:
refs/heads/master 584887b61 -> c7ba41eae
Fixed whitespace errors.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c7ba41ea
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c7ba41ea
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c7ba41ea
Branch: refs/heads/master
Commit: c7ba41eae8cf4bf153001b128c748ddcea543488
Parents: 584887b
Author: Vinod Kone <vi...@gmail.com>
Authored: Wed Jun 10 14:21:44 2015 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Jun 10 14:21:44 2015 -0700
----------------------------------------------------------------------
src/master/master.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c7ba41ea/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index fe2b2ae..15f2132 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -2704,15 +2704,15 @@ void Master::_accept(
// Validate the task.
- // Make a copy of the original task so that we can
- // fill the missing `framework_id` in ExecutorInfo
- // if needed. This field was added to the API later
- // and thus was made optional.
- TaskInfo task_(task);
- if (task.has_executor() && !task.executor().has_framework_id()) {
- task_.mutable_executor()
- ->mutable_framework_id()->CopyFrom(framework->id());
- }
+ // Make a copy of the original task so that we can
+ // fill the missing `framework_id` in ExecutorInfo
+ // if needed. This field was added to the API later
+ // and thus was made optional.
+ TaskInfo task_(task);
+ if (task.has_executor() && !task.executor().has_framework_id()) {
+ task_.mutable_executor()
+ ->mutable_framework_id()->CopyFrom(framework->id());
+ }
const Option<Error>& validationError = validation::task::validate(
task_,