You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dm...@apache.org on 2015/02/23 18:55:08 UTC
[2/3] mesos git commit: mesos: Moved MAC and IP classes to
stout/mac.hpp and stout/ip.hpp
mesos: Moved MAC and IP classes to stout/mac.hpp and stout/ip.hpp
Review: https://reviews.apache.org/r/30999
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/628786b2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/628786b2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/628786b2
Branch: refs/heads/master
Commit: 628786b2d5c1c7a048c09389ac59da2cfe63e0a8
Parents: 4f732e3
Author: Evelina Dumitrescu <ev...@gmail.com>
Authored: Mon Feb 23 09:19:55 2015 -0800
Committer: Dominic Hamon <dm...@twitter.com>
Committed: Mon Feb 23 09:21:06 2015 -0800
----------------------------------------------------------------------
src/linux/routing/diagnosis/diagnosis.hpp | 2 +-
src/linux/routing/filter/icmp.hpp | 2 +-
src/linux/routing/filter/ip.hpp | 2 ++
src/linux/routing/link/link.cpp | 1 +
src/linux/routing/link/link.hpp | 2 +-
src/linux/routing/route.hpp | 2 +-
src/master/master.cpp | 1 +
src/sched/sched.cpp | 1 +
src/scheduler/scheduler.cpp | 2 +-
src/slave/containerizer/containerizer.cpp | 1 -
src/slave/containerizer/isolators/network/port_mapping.cpp | 1 +
src/slave/containerizer/isolators/network/port_mapping.hpp | 3 ++-
src/tests/port_mapping_tests.cpp | 2 ++
src/tests/routing_tests.cpp | 2 ++
14 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/linux/routing/diagnosis/diagnosis.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/diagnosis/diagnosis.hpp b/src/linux/routing/diagnosis/diagnosis.hpp
index 9161841..b8ce653 100644
--- a/src/linux/routing/diagnosis/diagnosis.hpp
+++ b/src/linux/routing/diagnosis/diagnosis.hpp
@@ -25,7 +25,7 @@
#include <vector>
-#include <stout/net.hpp>
+#include <stout/ip.hpp>
#include <stout/option.hpp>
#include <stout/try.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/linux/routing/filter/icmp.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/filter/icmp.hpp b/src/linux/routing/filter/icmp.hpp
index dc075a7..7b478c4 100644
--- a/src/linux/routing/filter/icmp.hpp
+++ b/src/linux/routing/filter/icmp.hpp
@@ -22,7 +22,7 @@
#include <string>
#include <vector>
-#include <stout/net.hpp>
+#include <stout/ip.hpp>
#include <stout/option.hpp>
#include <stout/result.hpp>
#include <stout/try.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/linux/routing/filter/ip.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/filter/ip.hpp b/src/linux/routing/filter/ip.hpp
index 566fd1e..932ed4b 100644
--- a/src/linux/routing/filter/ip.hpp
+++ b/src/linux/routing/filter/ip.hpp
@@ -27,7 +27,9 @@
#include <boost/functional/hash.hpp>
+#include <stout/ip.hpp>
#include <stout/net.hpp>
+#include <stout/mac.hpp>
#include <stout/option.hpp>
#include <stout/result.hpp>
#include <stout/try.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/linux/routing/link/link.cpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/link/link.cpp b/src/linux/routing/link/link.cpp
index 53677cd..6606e4a 100644
--- a/src/linux/routing/link/link.cpp
+++ b/src/linux/routing/link/link.cpp
@@ -43,6 +43,7 @@
#include <stout/error.hpp>
#include <stout/duration.hpp>
#include <stout/lambda.hpp>
+#include <stout/net.hpp>
#include <stout/none.hpp>
#include <stout/os.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/linux/routing/link/link.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/link/link.hpp b/src/linux/routing/link/link.hpp
index 7e5b79e..c2ddd6c 100644
--- a/src/linux/routing/link/link.hpp
+++ b/src/linux/routing/link/link.hpp
@@ -28,7 +28,7 @@
#include <process/future.hpp>
#include <stout/hashmap.hpp>
-#include <stout/net.hpp>
+#include <stout/mac.hpp>
#include <stout/nothing.hpp>
#include <stout/option.hpp>
#include <stout/result.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/linux/routing/route.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/route.hpp b/src/linux/routing/route.hpp
index f443e06..9e53391 100644
--- a/src/linux/routing/route.hpp
+++ b/src/linux/routing/route.hpp
@@ -22,7 +22,7 @@
#include <string>
#include <vector>
-#include <stout/net.hpp>
+#include <stout/ip.hpp>
#include <stout/option.hpp>
#include <stout/result.hpp>
#include <stout/try.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 57e86ee..713307e 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -45,6 +45,7 @@
#include <stout/check.hpp>
#include <stout/error.hpp>
+#include <stout/ip.hpp>
#include <stout/lambda.hpp>
#include <stout/memory.hpp>
#include <stout/multihashmap.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index 61e5d15..0f85703 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -60,6 +60,7 @@
#include <stout/error.hpp>
#include <stout/flags.hpp>
#include <stout/hashmap.hpp>
+#include <stout/ip.hpp>
#include <stout/lambda.hpp>
#include <stout/net.hpp>
#include <stout/option.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index 66325c5..5ae2796 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -51,8 +51,8 @@
#include <stout/duration.hpp>
#include <stout/error.hpp>
#include <stout/flags.hpp>
+#include <stout/ip.hpp>
#include <stout/lambda.hpp>
-#include <stout/net.hpp>
#include <stout/nothing.hpp>
#include <stout/option.hpp>
#include <stout/os.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/slave/containerizer/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/containerizer.cpp b/src/slave/containerizer/containerizer.cpp
index 3f2ef8b..33f8738 100644
--- a/src/slave/containerizer/containerizer.cpp
+++ b/src/slave/containerizer/containerizer.cpp
@@ -24,7 +24,6 @@
#include <stout/fs.hpp>
#include <stout/hashmap.hpp>
-#include <stout/net.hpp>
#include <stout/stringify.hpp>
#include <stout/strings.hpp>
#include <stout/uuid.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/slave/containerizer/isolators/network/port_mapping.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/network/port_mapping.cpp b/src/slave/containerizer/isolators/network/port_mapping.cpp
index 6210478..ae1a7c6 100644
--- a/src/slave/containerizer/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/isolators/network/port_mapping.cpp
@@ -38,6 +38,7 @@
#include <stout/hashset.hpp>
#include <stout/json.hpp>
#include <stout/lambda.hpp>
+#include <stout/mac.hpp>
#include <stout/numify.hpp>
#include <stout/os.hpp>
#include <stout/option.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/slave/containerizer/isolators/network/port_mapping.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/network/port_mapping.hpp b/src/slave/containerizer/isolators/network/port_mapping.hpp
index 654f55e..8443097 100644
--- a/src/slave/containerizer/isolators/network/port_mapping.hpp
+++ b/src/slave/containerizer/isolators/network/port_mapping.hpp
@@ -37,8 +37,9 @@
#include <stout/bytes.hpp>
#include <stout/hashmap.hpp>
#include <stout/hashset.hpp>
+#include <stout/ip.hpp>
#include <stout/interval.hpp>
-#include <stout/net.hpp>
+#include <stout/mac.hpp>
#include <stout/none.hpp>
#include <stout/option.hpp>
#include <stout/subcommand.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/tests/port_mapping_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/port_mapping_tests.cpp b/src/tests/port_mapping_tests.cpp
index a03de23..9b1b5f1 100644
--- a/src/tests/port_mapping_tests.cpp
+++ b/src/tests/port_mapping_tests.cpp
@@ -29,7 +29,9 @@
#include <stout/bytes.hpp>
#include <stout/gtest.hpp>
+#include <stout/ip.hpp>
#include <stout/json.hpp>
+#include <stout/mac.hpp>
#include <stout/net.hpp>
#include "linux/fs.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/628786b2/src/tests/routing_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/routing_tests.cpp b/src/tests/routing_tests.cpp
index 6809659..3cda6ab 100644
--- a/src/tests/routing_tests.cpp
+++ b/src/tests/routing_tests.cpp
@@ -32,6 +32,8 @@
#include <stout/foreach.hpp>
#include <stout/gtest.hpp>
#include <stout/hashmap.hpp>
+#include <stout/ip.hpp>
+#include <stout/mac.hpp>
#include <stout/net.hpp>
#include <stout/stringify.hpp>