Repository: mesos Updated Branches: refs/heads/master d042f452f -> cb4dc7643
Corrected a few comments. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cb4dc764 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cb4dc764 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cb4dc764 Branch: refs/heads/master Commit: cb4dc76434abd12173d962815c4a430bb05e7968 Parents: d042f45 Author: Neil Conway <neil.con...@gmail.com> Authored: Mon Jun 5 13:44:39 2017 -0700 Committer: Neil Conway <neil.con...@gmail.com> Committed: Mon Jun 5 13:44:39 2017 -0700 ---------------------------------------------------------------------- src/common/resources.cpp | 7 ++++--- src/v1/resources.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/cb4dc764/src/common/resources.cpp ---------------------------------------------------------------------- diff --git a/src/common/resources.cpp b/src/common/resources.cpp index 97c00b2..6f963d4 100644 --- a/src/common/resources.cpp +++ b/src/common/resources.cpp @@ -353,7 +353,7 @@ static bool addable(const Resource& left, const Resource& right) return false; } - // Check ResourceProvider. + // Check ResourceProviderID. if (left.has_provider_id() != right.has_provider_id()) { return false; } @@ -439,7 +439,7 @@ static bool subtractable(const Resource& left, const Resource& right) return false; } - // Check ResourceProvider. + // Check ResourceProviderID. if (left.has_provider_id() != right.has_provider_id()) { return false; } @@ -457,7 +457,8 @@ static bool contains(const Resource& left, const Resource& right) { // NOTE: This is a necessary condition for 'contains'. // 'subtractable' will verify name, role, type, ReservationInfo, - // DiskInfo, SharedInfo and RevocableInfo compatibility. + // DiskInfo, SharedInfo, RevocableInfo, and ResourceProviderID + // compatibility. if (!subtractable(left, right)) { return false; } http://git-wip-us.apache.org/repos/asf/mesos/blob/cb4dc764/src/v1/resources.cpp ---------------------------------------------------------------------- diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp index 559b048..d740bd1 100644 --- a/src/v1/resources.cpp +++ b/src/v1/resources.cpp @@ -355,7 +355,7 @@ static bool addable(const Resource& left, const Resource& right) return false; } - // Check ResourceProvider. + // Check ResourceProviderID. if (left.has_provider_id() != right.has_provider_id()) { return false; } @@ -441,7 +441,7 @@ static bool subtractable(const Resource& left, const Resource& right) return false; } - // Check ResourceProvider. + // Check ResourceProviderID. if (left.has_provider_id() != right.has_provider_id()) { return false; } @@ -459,7 +459,8 @@ static bool contains(const Resource& left, const Resource& right) { // NOTE: This is a necessary condition for 'contains'. // 'subtractable' will verify name, role, type, ReservationInfo, - // DiskInfo, SharedInfo and RevocableInfo compatibility. + // DiskInfo, SharedInfo, RevocableInfo, and ResourceProviderID + // compatibility. if (!subtractable(left, right)) { return false; }
