[2/2] mesos git commit: Fixed provisioner appc support on windows build.

[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__
 }