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 2017/02/08 00:38:22 UTC
[6/7] mesos git commit: Cleaned up headers in sorter and allocator
metrics.
Cleaned up headers in sorter and allocator metrics.
Review: https://reviews.apache.org/r/56250/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/61d3f390
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/61d3f390
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/61d3f390
Branch: refs/heads/master
Commit: 61d3f39029ed8a616ff165859f5350861bcc4748
Parents: 2d41532
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Feb 6 13:05:22 2017 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Tue Feb 7 16:23:37 2017 -0800
----------------------------------------------------------------------
src/master/allocator/mesos/metrics.cpp | 9 ++++++---
src/master/allocator/mesos/metrics.hpp | 2 ++
src/master/allocator/sorter/drf/sorter.cpp | 8 +++-----
3 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/61d3f390/src/master/allocator/mesos/metrics.cpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/metrics.cpp b/src/master/allocator/mesos/metrics.cpp
index a36d21c..ec987fe 100644
--- a/src/master/allocator/mesos/metrics.cpp
+++ b/src/master/allocator/mesos/metrics.cpp
@@ -14,17 +14,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "master/allocator/mesos/metrics.hpp"
+
+#include <string>
+
#include <mesos/quota/quota.hpp>
+#include <process/metrics/gauge.hpp>
#include <process/metrics/metrics.hpp>
-#include <stout/strings.hpp>
+#include <stout/hashmap.hpp>
#include "master/allocator/mesos/hierarchical.hpp"
-#include "master/allocator/mesos/metrics.hpp"
using std::string;
-using std::vector;
using process::metrics::Gauge;
http://git-wip-us.apache.org/repos/asf/mesos/blob/61d3f390/src/master/allocator/mesos/metrics.hpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/metrics.hpp b/src/master/allocator/mesos/metrics.hpp
index 753f90a..ce486eb 100644
--- a/src/master/allocator/mesos/metrics.hpp
+++ b/src/master/allocator/mesos/metrics.hpp
@@ -20,6 +20,8 @@
#include <string>
#include <vector>
+#include <mesos/quota/quota.hpp>
+
#include <process/metrics/counter.hpp>
#include <process/metrics/gauge.hpp>
#include <process/metrics/timer.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/61d3f390/src/master/allocator/sorter/drf/sorter.cpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/sorter/drf/sorter.cpp b/src/master/allocator/sorter/drf/sorter.cpp
index db1fc0e..8e5548d 100644
--- a/src/master/allocator/sorter/drf/sorter.cpp
+++ b/src/master/allocator/sorter/drf/sorter.cpp
@@ -14,7 +14,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <algorithm>
+#include "master/allocator/sorter/drf/sorter.hpp"
+
#include <set>
#include <string>
#include <vector>
@@ -27,12 +28,9 @@
#include <stout/check.hpp>
#include <stout/foreach.hpp>
+#include <stout/hashmap.hpp>
#include <stout/option.hpp>
-#include "logging/logging.hpp"
-
-#include "master/allocator/sorter/drf/sorter.hpp"
-
using std::set;
using std::string;
using std::vector;