You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2015/06/25 19:26:17 UTC
[2/4] mesos git commit: Fixed right angle brackets in hierarchical
allocator.
Fixed right angle brackets in hierarchical allocator.
Review: https://reviews.apache.org/r/35837
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cca2b806
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cca2b806
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cca2b806
Branch: refs/heads/master
Commit: cca2b8069f720644fabe7452ec599e2ac575b74e
Parents: 1fcb1e4
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Jun 24 11:12:51 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Jun 25 10:25:44 2015 -0700
----------------------------------------------------------------------
include/mesos/master/allocator.hpp | 2 +-
src/master/allocator/mesos/allocator.hpp | 6 +++---
src/master/allocator/mesos/hierarchical.hpp | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cca2b806/include/mesos/master/allocator.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/master/allocator.hpp b/include/mesos/master/allocator.hpp
index 92de1af..22992c0 100644
--- a/include/mesos/master/allocator.hpp
+++ b/include/mesos/master/allocator.hpp
@@ -117,7 +117,7 @@ public:
const SlaveID& slaveId) = 0;
virtual void updateWhitelist(
- const Option<hashset<std::string> >& whitelist) = 0;
+ const Option<hashset<std::string>>& whitelist) = 0;
virtual void requestResources(
const FrameworkID& frameworkId,
http://git-wip-us.apache.org/repos/asf/mesos/blob/cca2b806/src/master/allocator/mesos/allocator.hpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/allocator.hpp b/src/master/allocator/mesos/allocator.hpp
index 6cfa046..72470ec 100644
--- a/src/master/allocator/mesos/allocator.hpp
+++ b/src/master/allocator/mesos/allocator.hpp
@@ -91,7 +91,7 @@ public:
const SlaveID& slaveId);
void updateWhitelist(
- const Option<hashset<std::string> >& whitelist);
+ const Option<hashset<std::string>>& whitelist);
void requestResources(
const FrameworkID& frameworkId,
@@ -177,7 +177,7 @@ public:
const SlaveID& slaveId) = 0;
virtual void updateWhitelist(
- const Option<hashset<std::string> >& whitelist) = 0;
+ const Option<hashset<std::string>>& whitelist) = 0;
virtual void requestResources(
const FrameworkID& frameworkId,
@@ -368,7 +368,7 @@ inline void MesosAllocator<AllocatorProcess>::deactivateSlave(
template <typename AllocatorProcess>
inline void MesosAllocator<AllocatorProcess>::updateWhitelist(
- const Option<hashset<std::string> >& whitelist)
+ const Option<hashset<std::string>>& whitelist)
{
process::dispatch(
process,
http://git-wip-us.apache.org/repos/asf/mesos/blob/cca2b806/src/master/allocator/mesos/hierarchical.hpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/hierarchical.hpp b/src/master/allocator/mesos/hierarchical.hpp
index cacf047..c6acdae 100644
--- a/src/master/allocator/mesos/hierarchical.hpp
+++ b/src/master/allocator/mesos/hierarchical.hpp
@@ -128,7 +128,7 @@ public:
const SlaveID& slaveId);
void updateWhitelist(
- const Option<hashset<std::string> >& whitelist);
+ const Option<hashset<std::string>>& whitelist);
void requestResources(
const FrameworkID& frameworkId,
@@ -256,7 +256,7 @@ protected:
hashmap<std::string, mesos::master::RoleInfo> roles;
// Slaves to send offers for.
- Option<hashset<std::string> > whitelist;
+ Option<hashset<std::string>> whitelist;
// There are two levels of sorting, hence "hierarchical".
// Level 1 sorts across roles:
@@ -620,7 +620,7 @@ HierarchicalAllocatorProcess<RoleSorter, FrameworkSorter>::deactivateSlave(
template <class RoleSorter, class FrameworkSorter>
void
HierarchicalAllocatorProcess<RoleSorter, FrameworkSorter>::updateWhitelist(
- const Option<hashset<std::string> >& _whitelist)
+ const Option<hashset<std::string>>& _whitelist)
{
CHECK(initialized);
@@ -885,7 +885,7 @@ HierarchicalAllocatorProcess<RoleSorter, FrameworkSorter>::allocate(
// framework having the corresponding role.
// (2) For unreserved resources on the slave, allocate these
// to a framework of any role.
- hashmap<FrameworkID, hashmap<SlaveID, Resources> > offerable;
+ hashmap<FrameworkID, hashmap<SlaveID, Resources>> offerable;
// Randomize the order in which slaves' resources are allocated.
// TODO(vinod): Implement a smarter sorting algorithm.