You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/10/20 21:50:13 UTC

[2/8] mesos git commit: Windows: Prepared agent for Windows support of `process/socket.hpp`.

Windows: Prepared agent for Windows support of `process/socket.hpp`.

In particular, we will remove the inclusion of `stout/os.hpp` from
`process/socket.hpp`, which will cause  a couple of files to break. Our
solution to this problem is to include `os.hpp` directly in those files.

Review: https://reviews.apache.org/r/39376


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ccac1ae3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ccac1ae3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ccac1ae3

Branch: refs/heads/master
Commit: ccac1ae32b1906ac50eac5973dfaddaa3c6ebac5
Parents: 3aae0b3
Author: Alex Clemmer <cl...@gmail.com>
Authored: Tue Oct 20 13:06:57 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Tue Oct 20 13:06:57 2015 -0400

----------------------------------------------------------------------
 src/linux/perf.cpp                                             | 1 +
 src/slave/containerizer/composing.cpp                          | 1 +
 src/slave/containerizer/isolators/cgroups/mem.cpp              | 1 +
 src/slave/containerizer/provisioner/docker/registry_client.cpp | 2 ++
 src/zookeeper/zookeeper.cpp                                    | 1 +
 5 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/ccac1ae3/src/linux/perf.cpp
----------------------------------------------------------------------
diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp
index f7035dd..5ebdc06 100644
--- a/src/linux/perf.cpp
+++ b/src/linux/perf.cpp
@@ -36,6 +36,7 @@
 #include <process/process.hpp>
 #include <process/subprocess.hpp>
 
+#include <stout/os.hpp>
 #include <stout/strings.hpp>
 #include <stout/unreachable.hpp>
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/ccac1ae3/src/slave/containerizer/composing.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/composing.cpp b/src/slave/containerizer/composing.cpp
index 8c3a235..83f15dd 100644
--- a/src/slave/containerizer/composing.cpp
+++ b/src/slave/containerizer/composing.cpp
@@ -26,6 +26,7 @@
 #include <stout/hashmap.hpp>
 #include <stout/hashset.hpp>
 #include <stout/lambda.hpp>
+#include <stout/os.hpp>
 
 #include "slave/state.hpp"
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/ccac1ae3/src/slave/containerizer/isolators/cgroups/mem.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/mem.cpp b/src/slave/containerizer/isolators/cgroups/mem.cpp
index 6f49e5a..55fa6f4 100644
--- a/src/slave/containerizer/isolators/cgroups/mem.cpp
+++ b/src/slave/containerizer/isolators/cgroups/mem.cpp
@@ -34,6 +34,7 @@
 #include <stout/foreach.hpp>
 #include <stout/hashset.hpp>
 #include <stout/lambda.hpp>
+#include <stout/os.hpp>
 #include <stout/path.hpp>
 #include <stout/stringify.hpp>
 #include <stout/try.hpp>

http://git-wip-us.apache.org/repos/asf/mesos/blob/ccac1ae3/src/slave/containerizer/provisioner/docker/registry_client.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/provisioner/docker/registry_client.cpp b/src/slave/containerizer/provisioner/docker/registry_client.cpp
index 471783d..24aa95c 100644
--- a/src/slave/containerizer/provisioner/docker/registry_client.cpp
+++ b/src/slave/containerizer/provisioner/docker/registry_client.cpp
@@ -23,6 +23,8 @@
 #include <process/http.hpp>
 #include <process/io.hpp>
 
+#include <stout/os.hpp>
+
 #include "slave/containerizer/provisioner/docker/registry_client.hpp"
 #include "slave/containerizer/provisioner/docker/token_manager.hpp"
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/ccac1ae3/src/zookeeper/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/zookeeper.cpp b/src/zookeeper/zookeeper.cpp
index e44403e..c7c8960 100644
--- a/src/zookeeper/zookeeper.cpp
+++ b/src/zookeeper/zookeeper.cpp
@@ -32,6 +32,7 @@
 
 #include <stout/duration.hpp>
 #include <stout/foreach.hpp>
+#include <stout/os.hpp>
 #include <stout/path.hpp>
 #include <stout/strings.hpp>
 #include <stout/unreachable.hpp>