You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2015/12/16 20:27:30 UTC
[1/2] mesos git commit: Removed unnecessary public declaration of
`model` for `ContainerStatus`.
Repository: mesos
Updated Branches:
refs/heads/master 09a2fb3ee -> fc0798f54
Removed unnecessary public declaration of `model` for `ContainerStatus`.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0ecad3b1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0ecad3b1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0ecad3b1
Branch: refs/heads/master
Commit: 0ecad3b1e13b7cf3e0bbd43df75a838322722ec1
Parents: 09a2fb3
Author: Michael Park <mp...@apache.org>
Authored: Wed Dec 16 17:27:09 2015 +0000
Committer: Michael Park <mp...@apache.org>
Committed: Wed Dec 16 17:27:54 2015 +0000
----------------------------------------------------------------------
src/common/http.hpp | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0ecad3b1/src/common/http.hpp
----------------------------------------------------------------------
diff --git a/src/common/http.hpp b/src/common/http.hpp
index 6a7a14c..4f4cbf6 100644
--- a/src/common/http.hpp
+++ b/src/common/http.hpp
@@ -78,7 +78,6 @@ JSON::Object model(const Attributes& attributes);
JSON::Object model(const CommandInfo& command);
JSON::Object model(const ExecutorInfo& executorInfo);
JSON::Array model(const Labels& labels);
-JSON::Object model(const ContainerStatus& status);
// These are the two identical ways to model a task, depending on
// whether you have a 'Task' or a 'TaskInfo' available.
[2/2] mesos git commit: Used `model` for `Labels` in `Master::Http`.
Posted by mp...@apache.org.
Used `model` for `Labels` in `Master::Http`.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fc0798f5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fc0798f5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fc0798f5
Branch: refs/heads/master
Commit: fc0798f546c461e38648bb20e23ccfad870ba83f
Parents: 0ecad3b
Author: Michael Park <mp...@apache.org>
Authored: Wed Dec 16 17:32:35 2015 +0000
Committer: Michael Park <mp...@apache.org>
Committed: Wed Dec 16 17:33:03 2015 +0000
----------------------------------------------------------------------
src/master/http.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fc0798f5/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 37fbcb9..8dfd67f 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -261,8 +261,7 @@ JSON::Object model(const Framework& framework)
// Model all of the labels associated with a framework.
if (framework.info.has_labels()) {
- const mesos::Labels labels = framework.info.labels();
- object.values["labels"] = std::move(JSON::protobuf(labels.labels()));
+ object.values["labels"] = model(framework.info.labels());
}
return object;