Repository: mesos Updated Branches: refs/heads/master 49129bf2a -> 008607498
Replaced `.get().` with `->` for access to `Master::leader`. Review: https://reviews.apache.org/r/59558/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b048934c Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b048934c Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b048934c Branch: refs/heads/master Commit: b048934cd040e44a35567b098587dd078a58a807 Parents: 49129bf Author: Neil Conway <neil.con...@gmail.com> Authored: Thu May 25 10:01:52 2017 -0700 Committer: Neil Conway <neil.con...@gmail.com> Committed: Thu May 25 10:02:46 2017 -0700 ---------------------------------------------------------------------- src/master/http.cpp | 2 +- src/master/master.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b048934c/src/master/http.cpp ---------------------------------------------------------------------- diff --git a/src/master/http.cpp b/src/master/http.cpp index 7060b8f..eb80830 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -2781,7 +2781,7 @@ Future<Response> Master::Http::state( // TODO(haosdent): Deprecated this in favor of `leader_info` below. if (master->leader.isSome()) { - writer->field("leader", master->leader.get().pid()); + writer->field("leader", master->leader->pid()); } if (master->leader.isSome()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/b048934c/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index f02d388..52544fb 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -2173,7 +2173,7 @@ void Master::detected(const Future<Option<MasterInfo>>& _leader) // A different node has been elected as the leading master. LOG(INFO) << "The newly elected leader is " << (leader.isSome() - ? (leader.get().pid() + " with id " + leader.get().id()) + ? (leader->pid() + " with id " + leader->id()) : "None"); if (wasElected) {
