You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2017/05/31 21:51:25 UTC
[11/16] mesos git commit: Reordered the streaming functions in
slave.hpp|cpp.
Reordered the streaming functions in slave.hpp|cpp.
Ensure that the streaming functions are sorted according to alphabet
order.
Review: https://reviews.apache.org/r/59665
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3f5008a4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3f5008a4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3f5008a4
Branch: refs/heads/master
Commit: 3f5008a4226a489660a1be9185299d16825b0250
Parents: ca52dec
Author: Jie Yu <yu...@gmail.com>
Authored: Tue May 30 15:42:30 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed May 31 14:51:10 2017 -0700
----------------------------------------------------------------------
src/slave/slave.cpp | 24 ++++++++++++------------
src/slave/slave.hpp | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3f5008a4/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 4ba0958..014044d 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -7807,14 +7807,14 @@ std::ostream& operator<<(std::ostream& stream, const Executor& executor)
}
-std::ostream& operator<<(std::ostream& stream, Slave::State state)
+std::ostream& operator<<(std::ostream& stream, Executor::State state)
{
switch (state) {
- case Slave::RECOVERING: return stream << "RECOVERING";
- case Slave::DISCONNECTED: return stream << "DISCONNECTED";
- case Slave::RUNNING: return stream << "RUNNING";
- case Slave::TERMINATING: return stream << "TERMINATING";
- default: return stream << "UNKNOWN";
+ case Executor::REGISTERING: return stream << "REGISTERING";
+ case Executor::RUNNING: return stream << "RUNNING";
+ case Executor::TERMINATING: return stream << "TERMINATING";
+ case Executor::TERMINATED: return stream << "TERMINATED";
+ default: return stream << "UNKNOWN";
}
}
@@ -7829,14 +7829,14 @@ std::ostream& operator<<(std::ostream& stream, Framework::State state)
}
-std::ostream& operator<<(std::ostream& stream, Executor::State state)
+std::ostream& operator<<(std::ostream& stream, Slave::State state)
{
switch (state) {
- case Executor::REGISTERING: return stream << "REGISTERING";
- case Executor::RUNNING: return stream << "RUNNING";
- case Executor::TERMINATING: return stream << "TERMINATING";
- case Executor::TERMINATED: return stream << "TERMINATED";
- default: return stream << "UNKNOWN";
+ case Slave::RECOVERING: return stream << "RECOVERING";
+ case Slave::DISCONNECTED: return stream << "DISCONNECTED";
+ case Slave::RUNNING: return stream << "RUNNING";
+ case Slave::TERMINATING: return stream << "TERMINATING";
+ default: return stream << "UNKNOWN";
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/3f5008a4/src/slave/slave.hpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp
index c223e6a..da25c73 100644
--- a/src/slave/slave.hpp
+++ b/src/slave/slave.hpp
@@ -963,9 +963,9 @@ CommandInfo defaultExecutorCommandInfo(
const Option<std::string>& user);
-std::ostream& operator<<(std::ostream& stream, Slave::State state);
-std::ostream& operator<<(std::ostream& stream, Framework::State state);
std::ostream& operator<<(std::ostream& stream, Executor::State state);
+std::ostream& operator<<(std::ostream& stream, Framework::State state);
+std::ostream& operator<<(std::ostream& stream, Slave::State state);
// Needed for logging task/task group.