Repository: mesos Updated Branches: refs/heads/master a649a146e -> ed5725126
Minor formatting cleanup in the Master. Review: https://reviews.apache.org/r/35701 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ed572512 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ed572512 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ed572512 Branch: refs/heads/master Commit: ed5725126fff5e7eb3de726e5ef7aaf1fbf370dc Parents: a649a14 Author: Michael Park <[email protected]> Authored: Tue Jun 23 05:25:56 2015 +0200 Committer: Till Toenshoff <[email protected]> Committed: Tue Jun 23 05:25:57 2015 +0200 ---------------------------------------------------------------------- src/common/http.cpp | 3 +-- src/master/master.cpp | 15 +++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ed572512/src/common/http.cpp ---------------------------------------------------------------------- diff --git a/src/common/http.cpp b/src/common/http.cpp index 4c8102e..d667cc1 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -58,8 +58,7 @@ JSON::Object model(const Resources& resources) map<string, Value_Type> types = nonRevocable.types(); foreachpair (const string& name, const Value_Type& type, types) { - switch(type) - { + switch (type) { case Value::SCALAR: object.values[name] = nonRevocable.get<Value::Scalar>(name).get().value(); http://git-wip-us.apache.org/repos/asf/mesos/blob/ed572512/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index 0135c15..0782b54 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -969,10 +969,10 @@ void Master::exited(const UPID& pid) // Delay dispatching a message to ourselves for the timeout. delay(failoverTimeout, - self(), - &Master::frameworkFailoverTimeout, - framework->id(), - framework->reregisteredTime); + self(), + &Master::frameworkFailoverTimeout, + framework->id(), + framework->reregisteredTime); return; } @@ -1010,7 +1010,7 @@ void Master::exited(const UPID& pid) // Remove all non-checkpointing frameworks. hashset<FrameworkID> frameworkIds = - slave->tasks.keys() | slave->executors.keys(); + slave->tasks.keys() | slave->executors.keys(); foreach (const FrameworkID& frameworkId, frameworkIds) { Framework* framework = getFramework(frameworkId); @@ -1550,9 +1550,8 @@ Future<Option<Error>> Master::validate( return None(); } - LOG(INFO) - << "Authorizing framework principal '" << frameworkInfo.principal() - << "' to receive offers for role '" << frameworkInfo.role() << "'"; + LOG(INFO) << "Authorizing framework principal '" << frameworkInfo.principal() + << "' to receive offers for role '" << frameworkInfo.role() << "'"; mesos::ACL::RegisterFramework request; if (frameworkInfo.has_principal()) {
