You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/06/06 00:34:38 UTC
git commit: Exposed version in "/vars" and "/state.json" endpoints.
Updated Branches:
refs/heads/master 56eb02422 -> 5a25741bb
Exposed version in "/vars" and "/state.json" endpoints.
Review: https://reviews.apache.org/r/11642
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/5a25741b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/5a25741b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/5a25741b
Branch: refs/heads/master
Commit: 5a25741bb4e8d705f2d9612b6484e8db7411faba
Parents: 56eb024
Author: Vinod Kone <vi...@twitter.com>
Authored: Tue Jun 4 15:05:42 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Wed Jun 5 15:34:11 2013 -0700
----------------------------------------------------------------------
src/master/http.cpp | 10 +++++++---
src/slave/http.cpp | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5a25741b/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 7e105a4..47471d6 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -22,6 +22,8 @@
#include <string>
#include <vector>
+#include <mesos/mesos.hpp>
+
#include <stout/foreach.hpp>
#include <stout/json.hpp>
#include <stout/net.hpp>
@@ -225,9 +227,10 @@ Future<Response> vars(
std::ostringstream out;
out <<
- "build_date " << build::DATE << "\n" <<
- "build_user " << build::USER << "\n" <<
- "build_flags " << build::FLAGS << "\n";
+ "version: " << MESOS_VERSION << "\n" <<
+ "build_date: " << build::DATE << "\n" <<
+ "build_user: " << build::USER << "\n" <<
+ "build_flags: " << build::FLAGS << "\n";
// TODO(benh): Output flags.
return OK(out.str(), request.query.get("jsonp"));
@@ -311,6 +314,7 @@ Future<Response> state(
VLOG(1) << "HTTP request for '" << request.path << "'";
JSON::Object object;
+ object.values["version"] = MESOS_VERSION;
object.values["build_date"] = build::DATE;
object.values["build_time"] = build::TIME;
object.values["build_user"] = build::USER;
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/5a25741b/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index 67877c9..e362c30 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -21,6 +21,8 @@
#include <string>
#include <vector>
+#include <mesos/mesos.hpp>
+
#include <stout/foreach.hpp>
#include <stout/json.hpp>
#include <stout/net.hpp>
@@ -261,9 +263,10 @@ Future<Response> vars(
std::ostringstream out;
out <<
- "build_date " << build::DATE << "\n" <<
- "build_user " << build::USER << "\n" <<
- "build_flags " << build::FLAGS << "\n";
+ "version: " << MESOS_VERSION << "\n" <<
+ "build_date: " << build::DATE << "\n" <<
+ "build_user: " << build::USER << "\n" <<
+ "build_flags: " << build::FLAGS << "\n";
// TODO(benh): Output flags.
return OK(out.str(), request.query.get("jsonp"));
@@ -301,6 +304,7 @@ Future<Response> state(
LOG(INFO) << "HTTP request for '" << request.path << "'";
JSON::Object object;
+ object.values["version"] = MESOS_VERSION;
object.values["build_date"] = build::DATE;
object.values["build_time"] = build::TIME;
object.values["build_user"] = build::USER;