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 2016/08/09 20:04:39 UTC
[1/2] mesos git commit: Fixed minor code style issue.
Repository: mesos
Updated Branches:
refs/heads/master a30ce83ae -> 751a48155
Fixed minor code style issue.
Review: https://reviews.apache.org/r/50837/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/706d4dd6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/706d4dd6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/706d4dd6
Branch: refs/heads/master
Commit: 706d4dd6e16c2ec94f42c649c732a8eac106d6f8
Parents: a30ce83
Author: Jay Guo <gu...@cn.ibm.com>
Authored: Tue Aug 9 13:01:20 2016 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Tue Aug 9 13:01:51 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/include/process/protobuf.hpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/706d4dd6/3rdparty/libprocess/include/process/protobuf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/protobuf.hpp b/3rdparty/libprocess/include/process/protobuf.hpp
index 695c6e6..7bee444 100644
--- a/3rdparty/libprocess/include/process/protobuf.hpp
+++ b/3rdparty/libprocess/include/process/protobuf.hpp
@@ -63,7 +63,8 @@ inline void post(const process::UPID& from,
// Note that this header file assumes you will be linking
// against BOTH libprotobuf and libglog.
-namespace google { namespace protobuf {
+namespace google {
+namespace protobuf {
// Type conversions helpful for changing between protocol buffer types
// and standard C++ types (for parameters).
[2/2] mesos git commit: Fixed provisioner appc support on windows
build.
Posted by jo...@apache.org.
Fixed provisioner appc support on windows build.
The Windows version of `ProvisionerProcess::__provision` was compiling
but not correct, as a new field of `ProvisionInfo` was being initialized
with a default value (`None`).
Review: https://reviews.apache.org/r/50810/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/751a4815
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/751a4815
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/751a4815
Branch: refs/heads/master
Commit: 751a48155821a7b70e229991aa91dfc8f0e049a0
Parents: 706d4dd
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Aug 9 13:01:28 2016 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Tue Aug 9 13:02:11 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/provisioner/provisioner.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/751a4815/src/slave/containerizer/mesos/provisioner/provisioner.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/provisioner.cpp b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
index 6fc5652..ad19fec 100644
--- a/src/slave/containerizer/mesos/provisioner/provisioner.cpp
+++ b/src/slave/containerizer/mesos/provisioner/provisioner.cpp
@@ -329,6 +329,10 @@ Future<ProvisionInfo> ProvisionerProcess::__provision(
const Image& image,
const ImageInfo& imageInfo)
{
+#ifdef __WINDOWS__
+ return ProvisionInfo{
+ rootfs, imageInfo.dockerManifest, imageInfo.appcManifest};
+#else
// Skip single-layered images since no 'whiteout' files needs
// to be handled, and this excludes any image using the bind
// backend.
@@ -337,7 +341,6 @@ Future<ProvisionInfo> ProvisionerProcess::__provision(
rootfs, imageInfo.dockerManifest, imageInfo.appcManifest};
}
-#ifndef __WINDOWS__
// TODO(hausdorff): The FTS API is not available on some platforms, such as
// Windows. We will need to either (1) prove that this is not necessary for
// Windows Containers, which use much of the Docker spec themselves, or (2)
@@ -400,10 +403,7 @@ Future<ProvisionInfo> ProvisionerProcess::__provision(
}
}
- return ProvisionInfo{
- rootfs, imageInfo.dockerManifest, None()};
-#else
- return ProvisionInfo{ rootfs, imageInfo.dockerManifest };
+ return ProvisionInfo{rootfs, imageInfo.dockerManifest, None()};
#endif // __WINDOWS__
}