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/02/10 02:45:34 UTC

[1/2] mesos git commit: Windows: Added `stout/os/read.hpp` include to `windows/os.hpp`.

Repository: mesos
Updated Branches:
  refs/heads/master 062da2966 -> 8ed2a16f1


Windows: Added `stout/os/read.hpp` include to `windows/os.hpp`.

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


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

Branch: refs/heads/master
Commit: 8ed2a16f192ab4da4bdbca11a106aa45eafb7bee
Parents: 77c7ffa
Author: Alex Clemmer <cl...@gmail.com>
Authored: Tue Feb 9 17:41:19 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Tue Feb 9 17:41:52 2016 -0800

----------------------------------------------------------------------
 3rdparty/libprocess/3rdparty/stout/include/stout/windows/os.hpp | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8ed2a16f/3rdparty/libprocess/3rdparty/stout/include/stout/windows/os.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/windows/os.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/windows/os.hpp
index a2fd0c7..d917a99 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/windows/os.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/windows/os.hpp
@@ -31,6 +31,9 @@
 #include <stout/try.hpp>
 #include <stout/windows.hpp>
 
+#include <stout/os/os.hpp>
+#include <stout/os/read.hpp>
+
 #include <stout/os/raw/environment.hpp>
 
 namespace os {


[2/2] mesos git commit: CMake: Added AppC spec protocol buffer to build.

Posted by mp...@apache.org.
CMake: Added AppC spec protocol buffer to build.

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


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

Branch: refs/heads/master
Commit: 77c7ffa84d89a715229e0f59f39ead381d0aa039
Parents: 062da29
Author: Alex Clemmer <cl...@gmail.com>
Authored: Tue Feb 9 17:41:13 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Tue Feb 9 17:41:52 2016 -0800

----------------------------------------------------------------------
 src/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/77c7ffa8/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a29544..9ab84c0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,7 @@ include(MesosProtobuf)
 # Build the protobuf structs.
 PROTOC_TO_INCLUDE_DIR(MESOS            mesos/mesos)
 PROTOC_TO_INCLUDE_DIR(V1_MESOS         mesos/v1/mesos)
+PROTOC_TO_INCLUDE_DIR(APPC_SPEC        mesos/appc/spec)
 PROTOC_TO_INCLUDE_DIR(AUTHENTICATION   mesos/authentication/authentication)
 PROTOC_TO_INCLUDE_DIR(AUTHORIZATION    mesos/authorizer/authorizer)
 PROTOC_TO_INCLUDE_DIR(CONTAINERIZER    mesos/containerizer/containerizer)
@@ -51,6 +52,7 @@ PROTOC_TO_SRC_DIR(MESSAGE slave/containerizer/mesos/provisioner/docker/message)
 set(MESOS_PROTOBUF_SRC
   ${MESOS_PROTO_CC}
   ${V1_MESOS_PROTO_CC}
+  ${APPC_SPEC_PROTO_CC}
   ${AUTHENTICATION_PROTO_CC}
   ${AUTHORIZATION_PROTO_CC}
   ${CONTAINERIZER_PROTO_CC}