[1/2] mesos git commit: Removed extra spaces in docker.cpp.

[al...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 4fad7a645 -> a30ce83ae


Removed extra spaces in docker.cpp.

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


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

Branch: refs/heads/master
Commit: d17a12e941b673ecf2987cbfed654f873aa02dec
Parents: 4fad7a6
Author: haosdent huang <ha...@gmail.com>
Authored: Tue Aug 9 10:47:03 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Tue Aug 9 10:47:03 2016 +0200

----------------------------------------------------------------------
 src/docker/docker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/d17a12e9/src/docker/docker.cpp
----------------------------------------------------------------------
diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp
index e8d2cb9..e07c4aa 100755
--- a/src/docker/docker.cpp
+++ b/src/docker/docker.cpp
@@ -699,7 +699,7 @@ Future<Option<int>> Docker::run(
   }
 
   if (dockerInfo.port_mappings().size() > 0) {
-    if (network == "host" || network == "none"  ) {
+    if (network == "host" || network == "none") {
       return Failure("Port mappings are only supported for bridge and "
                      "user-defined networks");
     }

[2/2] mesos git commit: Fixed the incorrect order of header files in docker executor.

[al...@apache.org]

Fixed the incorrect order of header files in docker executor.

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


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

Branch: refs/heads/master
Commit: a30ce83ae7a5c5c83d5a84cbc66c1d0dad89f396
Parents: d17a12e
Author: haosdent huang <ha...@gmail.com>
Authored: Tue Aug 9 10:48:53 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Tue Aug 9 10:48:53 2016 +0200

----------------------------------------------------------------------
 src/docker/executor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a30ce83a/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index 445628c..4c08e5d 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -19,15 +19,15 @@
 #include <map>
 #include <string>
 
-#include <mesos/mesos.hpp>
 #include <mesos/executor.hpp>
+#include <mesos/mesos.hpp>
 
 #include <process/id.hpp>
+#include <process/owned.hpp>
 #include <process/process.hpp>
 #include <process/protobuf.hpp>
-#include <process/subprocess.hpp>
 #include <process/reap.hpp>
-#include <process/owned.hpp>
+#include <process/subprocess.hpp>
 
 #include <stout/error.hpp>
 #include <stout/flags.hpp>
@@ -38,8 +38,8 @@
 
 #include <stout/os/killtree.hpp>
 
-#include "common/status_utils.hpp"
 #include "common/protobuf_utils.hpp"
+#include "common/status_utils.hpp"
 
 #include "docker/docker.hpp"
 #include "docker/executor.hpp"