You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by me...@apache.org on 2016/03/14 10:36:06 UTC
[3/4] mesos git commit: Made 'framework' endpoint help string
consistent.
Made 'framework' endpoint help string consistent.
All other endpoint HELP functions are already named 'endpoint'_HELP().
Review: https://reviews.apache.org/r/44764/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/662f7b5f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/662f7b5f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/662f7b5f
Branch: refs/heads/master
Commit: 662f7b5f9ddd0fadb304698b5c4d739c6f2aa140
Parents: e78be41
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Mon Mar 14 01:19:40 2016 -0700
Committer: Adam B <ad...@mesosphere.io>
Committed: Mon Mar 14 01:19:40 2016 -0700
----------------------------------------------------------------------
src/master/http.cpp | 2 +-
src/master/master.cpp | 2 +-
src/master/master.hpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/662f7b5f/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 6dec322..bda03da 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -728,7 +728,7 @@ Future<Response> Master::Http::destroyVolumes(
}
-string Master::Http::FRAMEWORKS()
+string Master::Http::FRAMEWORKS_HELP()
{
return HELP(TLDR("Exposes the frameworks info."));
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/662f7b5f/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 255b4d1..d0380db 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -846,7 +846,7 @@ void Master::initialize()
});
route("/frameworks",
DEFAULT_HTTP_AUTHENTICATION_REALM,
- Http::FRAMEWORKS(),
+ Http::FRAMEWORKS_HELP(),
[this](const process::http::Request& request,
const Option<string>& principal) {
Http::log(request);
http://git-wip-us.apache.org/repos/asf/mesos/blob/662f7b5f/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index 7b51391..124d439 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -1169,7 +1169,7 @@ private:
static std::string SCHEDULER_HELP();
static std::string FLAGS_HELP();
- static std::string FRAMEWORKS();
+ static std::string FRAMEWORKS_HELP();
static std::string HEALTH_HELP();
static std::string OBSERVE_HELP();
static std::string REDIRECT_HELP();