You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2015/02/27 21:54:34 UTC
[2/2] mesos git commit: Removed double semicolons.
Removed double semicolons.
Review: https://reviews.apache.org/r/31416
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bc7a24cf
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bc7a24cf
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bc7a24cf
Branch: refs/heads/master
Commit: bc7a24cf3e59416ff72363d5a0df7e9e7130ff6f
Parents: 054e910
Author: Alexander Rukletsov <al...@mesosphere.io>
Authored: Fri Feb 27 12:54:03 2015 -0800
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Fri Feb 27 12:54:05 2015 -0800
----------------------------------------------------------------------
src/exec/exec.cpp | 2 +-
src/slave/containerizer/isolators/cgroups/cpushare.cpp | 2 +-
src/slave/slave.cpp | 2 +-
src/tests/reconciliation_tests.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bc7a24cf/src/exec/exec.cpp
----------------------------------------------------------------------
diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp
index a159846..d678f06 100644
--- a/src/exec/exec.cpp
+++ b/src/exec/exec.cpp
@@ -520,7 +520,7 @@ protected:
// Incoming status update might come from an executor which has not set
// slave id in TaskStatus. Set/overwrite slave id.
- update->mutable_status()->mutable_slave_id()->CopyFrom(slaveId);;
+ update->mutable_status()->mutable_slave_id()->CopyFrom(slaveId);
VLOG(1) << "Executor sending status update " << *update;
http://git-wip-us.apache.org/repos/asf/mesos/blob/bc7a24cf/src/slave/containerizer/isolators/cgroups/cpushare.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.cpp b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
index b6df239..d496768 100644
--- a/src/slave/containerizer/isolators/cgroups/cpushare.cpp
+++ b/src/slave/containerizer/isolators/cgroups/cpushare.cpp
@@ -200,7 +200,7 @@ Future<Nothing> CgroupsCpushareIsolatorProcess::recover(
continue;
}
- infos[containerId] = new Info(containerId, cgroup);;
+ infos[containerId] = new Info(containerId, cgroup);
cgroups.insert(cgroup);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bc7a24cf/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 9f31fa4..a06d680 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -879,7 +879,7 @@ void Slave::reregistered(
// https://issues.apache.org/jira/browse/MESOS-677
default:
LOG(FATAL) << "Unexpected slave state " << state;
- return;;
+ return;
}
if (!(info.id() == slaveId)) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/bc7a24cf/src/tests/reconciliation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/reconciliation_tests.cpp b/src/tests/reconciliation_tests.cpp
index b79f85e..acd7002 100644
--- a/src/tests/reconciliation_tests.cpp
+++ b/src/tests/reconciliation_tests.cpp
@@ -740,7 +740,7 @@ TEST_F(ReconciliationTest, UnacknowledgedTerminalTask)
// Prevent the slave from retrying the status update by
// only allowing a single update through to the master.
DROP_PROTOBUFS(StatusUpdateMessage(), _, master.get());
- FUTURE_PROTOBUF(StatusUpdateMessage(), _, master.get());;
+ FUTURE_PROTOBUF(StatusUpdateMessage(), _, master.get());
// Drop the status update acknowledgements to ensure that the
// task remains terminal and unacknowledged in the master.