Repository: mesos Updated Branches: refs/heads/master 972ceb9e9 -> 51a0dab78
Removed deprecated /shutdown master endpoint. Review: https://reviews.apache.org/r/36732 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/51a0dab7 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/51a0dab7 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/51a0dab7 Branch: refs/heads/master Commit: 51a0dab783cd3619776f53a7b0de4c61ba2e161a Parents: 972ceb9 Author: Joerg Schad <[email protected]> Authored: Fri Jul 24 12:31:44 2015 +0200 Committer: Bernd Mathiske <[email protected]> Committed: Fri Jul 24 12:31:46 2015 +0200 ---------------------------------------------------------------------- src/master/http.cpp | 13 ------------- src/master/master.cpp | 10 ---------- src/master/master.hpp | 1 - 3 files changed, 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/51a0dab7/src/master/http.cpp ---------------------------------------------------------------------- diff --git a/src/master/http.cpp b/src/master/http.cpp index 6f5ca02..3a1598f 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -946,19 +946,6 @@ Future<Response> Master::Http::roles(const Request& request) const } -const string Master::Http::SHUTDOWN_HELP = HELP( - TLDR( - "Shuts down a running framework by shutting down all tasks/executors " - "and removing the framework."), - USAGE( - "/master/shutdown"), - DESCRIPTION( - "NOTE: This endpoint is deprecated in favor of /master/teardown.", - "Please provide a \"frameworkId\" value designating the running " - "framework to shut down.", - "Returns 200 OK if the framework was correctly shutdown.")); - - const string Master::Http::TEARDOWN_HELP = HELP( TLDR( "Tears down a running framework by shutting down all tasks/executors " http://git-wip-us.apache.org/repos/asf/mesos/blob/51a0dab7/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index bab04fe..7796630 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -764,22 +764,12 @@ void Master::initialize() Http::log(request); return http.roles(request); }); - - // TODO(vinod): "/shutdown" endpoint is deprecated in favor of - // "/teardown". Remove this endpoint in 0.24.0. - route("/shutdown", - Http::SHUTDOWN_HELP, - [http](const process::http::Request& request) { - Http::log(request); - return http.teardown(request); - }); route("/teardown", Http::TEARDOWN_HELP, [http](const process::http::Request& request) { Http::log(request); return http.teardown(request); }); - route("/slaves", Http::SLAVES_HELP, [http](const process::http::Request& request) { http://git-wip-us.apache.org/repos/asf/mesos/blob/51a0dab7/src/master/master.hpp ---------------------------------------------------------------------- diff --git a/src/master/master.hpp b/src/master/master.hpp index bf61bb2..29113cb 100644 --- a/src/master/master.hpp +++ b/src/master/master.hpp @@ -1110,7 +1110,6 @@ private: const static std::string OBSERVE_HELP; const static std::string REDIRECT_HELP; const static std::string ROLES_HELP; - const static std::string SHUTDOWN_HELP; // Deprecated. const static std::string TEARDOWN_HELP; const static std::string SLAVES_HELP; const static std::string STATE_HELP;
