You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/06/21 04:09:44 UTC
[4/9] mesos git commit: Added evolve logic for `master::Event` ->
`v1::master::Event`.
Added evolve logic for `master::Event` -> `v1::master::Event`.
Review: https://reviews.apache.org/r/48877/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9d3e01cb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9d3e01cb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9d3e01cb
Branch: refs/heads/master
Commit: 9d3e01cb43d84673fbebe06d240eeaf3169feb25
Parents: f0d0775
Author: Anand Mazumdar <an...@apache.org>
Authored: Mon Jun 20 20:49:41 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Mon Jun 20 20:49:41 2016 -0700
----------------------------------------------------------------------
src/internal/evolve.cpp | 6 ++++++
src/internal/evolve.hpp | 5 +++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9d3e01cb/src/internal/evolve.cpp
----------------------------------------------------------------------
diff --git a/src/internal/evolve.cpp b/src/internal/evolve.cpp
index 67c5503..6b1cf3c 100644
--- a/src/internal/evolve.cpp
+++ b/src/internal/evolve.cpp
@@ -490,6 +490,12 @@ v1::master::Response evolve(const maintenance::Schedule& schedule)
}
+v1::master::Event evolve(const mesos::master::Event& event)
+{
+ return evolve<v1::master::Event>(event);
+}
+
+
template<>
v1::master::Response evolve<v1::master::Response::GET_FLAGS>(
const JSON::Object& object)
http://git-wip-us.apache.org/repos/asf/mesos/blob/9d3e01cb/src/internal/evolve.hpp
----------------------------------------------------------------------
diff --git a/src/internal/evolve.hpp b/src/internal/evolve.hpp
index 7ce62d9..321e0cc 100644
--- a/src/internal/evolve.hpp
+++ b/src/internal/evolve.hpp
@@ -23,6 +23,8 @@
#include <mesos/mesos.hpp>
+#include <mesos/master/master.hpp>
+
#include <mesos/executor/executor.hpp>
#include <mesos/master/master.hpp>
@@ -121,6 +123,9 @@ v1::executor::Event evolve(const StatusUpdateAcknowledgementMessage& message);
v1::executor::Event evolve(const ShutdownExecutorMessage& message);
+v1::master::Event evolve(const mesos::master::Event& event);
+
+
// Before the v1 API we had REST endpoints that returned JSON. The JSON was not
// specified in any formal way, i.e., there were no protobufs which captured the
// structure. As part of the v1 API we introduced the Call/Response protobufs