You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/07/12 00:09:31 UTC
[1/2] mesos git commit: Removed an unnecessary `Clock::settle` from a
test case.
Repository: mesos
Updated Branches:
refs/heads/master c84880a1d -> e765520f3
Removed an unnecessary `Clock::settle` from a test case.
Review: https://reviews.apache.org/r/49692/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f0059b4c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f0059b4c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f0059b4c
Branch: refs/heads/master
Commit: f0059b4c44dd297bd43853eb5c427b1cc8e218a8
Parents: c84880a
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Jul 11 17:09:13 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Jul 11 17:09:13 2016 -0700
----------------------------------------------------------------------
src/tests/master_slave_reconciliation_tests.cpp | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f0059b4c/src/tests/master_slave_reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_slave_reconciliation_tests.cpp b/src/tests/master_slave_reconciliation_tests.cpp
index 69ec707..3bb6499 100644
--- a/src/tests/master_slave_reconciliation_tests.cpp
+++ b/src/tests/master_slave_reconciliation_tests.cpp
@@ -614,9 +614,6 @@ TEST_F(MasterSlaveReconciliationTest, SlaveReregisterFrameworks)
EXPECT_EQ(1u, reregisterSlave.get().frameworks().size());
- Clock::pause();
- Clock::settle();
-
AWAIT_READY(status);
EXPECT_CALL(exec, shutdown(_))
[2/2] mesos git commit: Cleaned up some minor style issues.
Posted by vi...@apache.org.
Cleaned up some minor style issues.
Review: https://reviews.apache.org/r/49693/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e765520f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e765520f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e765520f
Branch: refs/heads/master
Commit: e765520f3fba9a45f7105272f6102ee8799ef117
Parents: f0059b4
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Jul 11 17:09:18 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Jul 11 17:09:18 2016 -0700
----------------------------------------------------------------------
src/master/master.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e765520f/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 79e3d78..61eaa4a 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -1432,7 +1432,7 @@ void Master::_exited(Framework* framework)
}
-Future<bool> Master::authorizeLogAccess(const Option<std::string>& principal)
+Future<bool> Master::authorizeLogAccess(const Option<string>& principal)
{
if (authorizer.isNone()) {
return true;
@@ -1723,7 +1723,7 @@ Future<Nothing> Master::_recover(const Registry& registry)
if (registry.weights_size() != 0) {
vector<WeightInfo> weightInfos;
- hashmap<std::string, double> registry_weights;
+ hashmap<string, double> registry_weights;
// Save the weights.
foreach (const Registry::Weight& weight, registry.weights()) {
@@ -1745,7 +1745,7 @@ Future<Nothing> Master::_recover(const Registry& registry)
// Before recovering weights from the registry, the allocator was already
// initialized with `--weights`, so here we need to reset (to 1.0)
// weights in the allocator that are not overridden by the registry.
- foreachkey (const std::string& role, weights) {
+ foreachkey (const string& role, weights) {
if (!registry_weights.contains(role)) {
WeightInfo weightInfo;
weightInfo.set_role(role);
@@ -1768,7 +1768,7 @@ Future<Nothing> Master::_recover(const Registry& registry)
// Initialize the registry with `--weights` flag when bootstrapping
// the cluster.
vector<WeightInfo> weightInfos;
- foreachpair (const std::string& role, double weight, weights) {
+ foreachpair (const string& role, double weight, weights) {
WeightInfo weightInfo;
weightInfo.set_role(role);
weightInfo.set_weight(weight);
@@ -3155,7 +3155,7 @@ Future<bool> Master::authorizeReserveResources(
}
return await(authorizations)
- .then([](const std::list<Future<bool>>& authorizations)
+ .then([](const list<Future<bool>>& authorizations)
-> Future<bool> {
// Compute a disjunction.
foreach (const Future<bool>& authorization, authorizations) {
@@ -3208,7 +3208,7 @@ Future<bool> Master::authorizeUnreserveResources(
}
return await(authorizations)
- .then([](const std::list<Future<bool>>& authorizations)
+ .then([](const list<Future<bool>>& authorizations)
-> Future<bool> {
// Compute a disjunction.
foreach (const Future<bool>& authorization, authorizations) {
@@ -3260,7 +3260,7 @@ Future<bool> Master::authorizeCreateVolume(
}
return await(authorizations)
- .then([](const std::list<Future<bool>>& authorizations)
+ .then([](const list<Future<bool>>& authorizations)
-> Future<bool> {
// Compute a disjunction.
foreach (const Future<bool>& authorization, authorizations) {
@@ -3312,7 +3312,7 @@ Future<bool> Master::authorizeDestroyVolume(
}
return await(authorizations)
- .then([](const std::list<Future<bool>>& authorizations)
+ .then([](const list<Future<bool>>& authorizations)
-> Future<bool> {
// Compute a disjunction.
foreach (const Future<bool>& authorization, authorizations) {
@@ -5005,7 +5005,7 @@ void Master::_reregisterSlave(
void Master::__reregisterSlave(
Slave* slave,
- const std::vector<Task>& tasks,
+ const vector<Task>& tasks,
const vector<FrameworkInfo>& frameworks)
{
CHECK_NOTNULL(slave);