Repository: mesos Updated Branches: refs/heads/master d6ff7513a -> 37dc886ee
Renamed method 'getWeights' to 'get' in WeightsHandler. Review: https://reviews.apache.org/r/49293/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/37dc886e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/37dc886e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/37dc886e Branch: refs/heads/master Commit: 37dc886eef0bfa1fc08853c307a9177673489801 Parents: d6ff751 Author: zhou xing <xingz...@cn.ibm.com> Authored: Mon Jun 27 23:26:26 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Mon Jun 27 23:26:26 2016 -0700 ---------------------------------------------------------------------- src/master/http.cpp | 2 +- src/master/master.hpp | 2 +- src/master/weights_handler.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/37dc886e/src/master/http.cpp ---------------------------------------------------------------------- diff --git a/src/master/http.cpp b/src/master/http.cpp index 9e6d291..902cee3 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -553,7 +553,7 @@ Future<Response> Master::Http::api( return getRoles(call, principal, acceptType); case mesos::master::Call::GET_WEIGHTS: - return weightsHandler.getWeights(call, principal, acceptType); + return weightsHandler.get(call, principal, acceptType); case mesos::master::Call::UPDATE_WEIGHTS: return NotImplemented(); http://git-wip-us.apache.org/repos/asf/mesos/blob/37dc886e/src/master/master.hpp ---------------------------------------------------------------------- diff --git a/src/master/master.hpp b/src/master/master.hpp index f16bccd..8690390 100644 --- a/src/master/master.hpp +++ b/src/master/master.hpp @@ -1100,7 +1100,7 @@ private: const process::http::Request& request, const Option<std::string>& principal) const; - process::Future<process::http::Response> getWeights( + process::Future<process::http::Response> get( const mesos::master::Call& call, const Option<std::string>& principal, ContentType contentType) const; http://git-wip-us.apache.org/repos/asf/mesos/blob/37dc886e/src/master/weights_handler.cpp ---------------------------------------------------------------------- diff --git a/src/master/weights_handler.cpp b/src/master/weights_handler.cpp index 51c957f..0332d86 100644 --- a/src/master/weights_handler.cpp +++ b/src/master/weights_handler.cpp @@ -77,7 +77,7 @@ Future<http::Response> Master::WeightsHandler::get( } -Future<http::Response> Master::WeightsHandler::getWeights( +Future<http::Response> Master::WeightsHandler::get( const mesos::master::Call& call, const Option<string>& principal, ContentType contentType) const
