You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2017/05/24 17:05:43 UTC
[05/10] mesos git commit: Fixed docker/appc store 'using' format.
Fixed docker/appc store 'using' format.
Review: https://reviews.apache.org/r/59011
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/32dc11ab
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/32dc11ab
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/32dc11ab
Branch: refs/heads/master
Commit: 32dc11abd74c96a02c52e71448823d93207817f9
Parents: 9038548
Author: Gilbert Song <so...@gmail.com>
Authored: Mon May 1 16:42:46 2017 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Thu May 25 01:04:30 2017 +0800
----------------------------------------------------------------------
include/mesos/appc/spec.hpp | 1 +
.../containerizer/mesos/provisioner/appc/store.cpp | 12 ++++++++++--
.../containerizer/mesos/provisioner/docker/store.cpp | 14 ++++++++++++--
src/slave/containerizer/mesos/provisioner/store.cpp | 4 ++--
4 files changed, 25 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/32dc11ab/include/mesos/appc/spec.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/appc/spec.hpp b/include/mesos/appc/spec.hpp
index e9430df..0fef217 100644
--- a/include/mesos/appc/spec.hpp
+++ b/include/mesos/appc/spec.hpp
@@ -21,6 +21,7 @@
#include <stout/error.hpp>
#include <stout/option.hpp>
+#include <stout/try.hpp>
#include <mesos/appc/spec.pb.h>
http://git-wip-us.apache.org/repos/asf/mesos/blob/32dc11ab/src/slave/containerizer/mesos/provisioner/appc/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/appc/store.cpp b/src/slave/containerizer/mesos/provisioner/appc/store.cpp
index 09a40a5..dc547dd 100644
--- a/src/slave/containerizer/mesos/provisioner/appc/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/appc/store.cpp
@@ -35,15 +35,23 @@
#include "slave/containerizer/mesos/provisioner/appc/paths.hpp"
#include "slave/containerizer/mesos/provisioner/appc/store.hpp"
-using namespace process;
-
namespace spec = appc::spec;
using std::list;
using std::string;
using std::vector;
+using process::Failure;
+using process::Future;
using process::Owned;
+using process::Process;
+using process::Promise;
+
+using process::defer;
+using process::dispatch;
+using process::spawn;
+using process::terminate;
+using process::wait;
namespace mesos {
namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/32dc11ab/src/slave/containerizer/mesos/provisioner/docker/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/store.cpp b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
index 68ce265..7529afd 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
@@ -40,14 +40,24 @@
#include "uri/fetcher.hpp"
-using namespace process;
-
namespace spec = docker::spec;
using std::list;
using std::string;
using std::vector;
+using process::Failure;
+using process::Future;
+using process::Owned;
+using process::Process;
+using process::Promise;
+
+using process::defer;
+using process::dispatch;
+using process::spawn;
+using process::terminate;
+using process::wait;
+
namespace mesos {
namespace internal {
namespace slave {
http://git-wip-us.apache.org/repos/asf/mesos/blob/32dc11ab/src/slave/containerizer/mesos/provisioner/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/store.cpp b/src/slave/containerizer/mesos/provisioner/store.cpp
index 7141d63..260a746 100644
--- a/src/slave/containerizer/mesos/provisioner/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/store.cpp
@@ -28,10 +28,10 @@
#include "slave/containerizer/mesos/provisioner/docker/store.hpp"
-using namespace process;
-
using std::string;
+using process::Owned;
+
namespace mesos {
namespace internal {
namespace slave {