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 2016/06/22 00:37:47 UTC

mesos git commit: Added the missing evolutions in `GetMetrics` operator APIs.

Repository: mesos
Updated Branches:
  refs/heads/master bfda226bc -> b8d230990


Added the missing evolutions in `GetMetrics` operator APIs.

Review: https://reviews.apache.org/r/49056/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b8d23099
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b8d23099
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b8d23099

Branch: refs/heads/master
Commit: b8d230990edd7c95c665a1459588edbefe724e09
Parents: bfda226
Author: haosdent huang <ha...@gmail.com>
Authored: Tue Jun 21 17:37:24 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Jun 21 17:37:24 2016 -0700

----------------------------------------------------------------------
 src/master/http.cpp | 3 ++-
 src/slave/http.cpp  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/b8d23099/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 92504a4..424469c 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -1385,7 +1385,8 @@ Future<Response> Master::Http::getMetrics(
           metric->set_value(value);
         }
 
-        return OK(serialize(contentType, response), stringify(contentType));
+        return OK(serialize(contentType, evolve(response)),
+                  stringify(contentType));
       });
 }
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/b8d23099/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index 24f7a22..22b5930 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -614,7 +614,8 @@ Future<Response> Slave::Http::getMetrics(
           metric->set_value(value);
         }
 
-        return OK(serialize(contentType, response), stringify(contentType));
+        return OK(serialize(contentType, evolve(response)),
+                  stringify(contentType));
       });
 }