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 2016/01/04 11:43:25 UTC
[5/5] mesos git commit: Cleaned up STL I/O includes in external
containerizer.
Cleaned up STL I/O includes in external containerizer.
Removed unused I/O includes, cleaned up blank lines and include order.
Review: https://reviews.apache.org/r/41510/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e8d3ab1e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e8d3ab1e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e8d3ab1e
Branch: refs/heads/master
Commit: e8d3ab1ebdd8b96cd4dbb665639f84265f00ded2
Parents: d3a5a61
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Mon Jan 4 02:25:25 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Mon Jan 4 02:37:22 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/external_containerizer.cpp | 15 +++++----------
src/slave/containerizer/external_containerizer.hpp | 1 -
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e8d3ab1e/src/slave/containerizer/external_containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/external_containerizer.cpp b/src/slave/containerizer/external_containerizer.cpp
index 04cf31e..fe368dd 100644
--- a/src/slave/containerizer/external_containerizer.cpp
+++ b/src/slave/containerizer/external_containerizer.cpp
@@ -14,16 +14,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <iostream>
-#include <iomanip>
-#include <list>
-#include <tuple>
-
#include <errno.h>
#include <poll.h>
#include <signal.h>
#include <stdio.h>
+#include <list>
+#include <tuple>
+
#include <mesos/type_utils.hpp>
#include <process/async.hpp>
@@ -49,14 +47,12 @@
#include "slave/containerizer/external_containerizer.hpp"
-
using lambda::bind;
using std::list;
using std::map;
using std::set;
using std::string;
-using std::stringstream;
using std::tuple;
using std::vector;
@@ -71,7 +67,6 @@ using state::FrameworkState;
using state::RunState;
using state::SlaveState;
-
Try<ExternalContainerizer*> ExternalContainerizer::create(const Flags& flags)
{
return new ExternalContainerizer(flags);
@@ -433,8 +428,8 @@ Future<bool> ExternalContainerizerProcess::launch(
const ContainerID& containerId,
const Option<TaskInfo>& taskInfo,
const ExecutorInfo& executor,
- const std::string& directory,
- const Option<std::string>& user,
+ const string& directory,
+ const Option<string>& user,
const SlaveID& slaveId,
const PID<Slave>& slavePid,
bool checkpoint)
http://git-wip-us.apache.org/repos/asf/mesos/blob/e8d3ab1e/src/slave/containerizer/external_containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/external_containerizer.hpp b/src/slave/containerizer/external_containerizer.hpp
index a5b4079..feeb027 100644
--- a/src/slave/containerizer/external_containerizer.hpp
+++ b/src/slave/containerizer/external_containerizer.hpp
@@ -18,7 +18,6 @@
#define __EXTERNAL_CONTAINERIZER_HPP__
#include <list>
-#include <sstream>
#include <string>
#include <tuple>