Repository: mesos Updated Branches: refs/heads/master b7bb6696b -> ab6eca0a8
Removed two 'auto's that slipped into the codebase. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ab6eca0a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ab6eca0a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ab6eca0a Branch: refs/heads/master Commit: ab6eca0a8c4ab523674565eaf24f39b679ca00bd Parents: b7bb669 Author: Benjamin Mahler <[email protected]> Authored: Wed Jan 28 19:59:20 2015 -0800 Committer: Benjamin Mahler <[email protected]> Committed: Wed Jan 28 20:15:39 2015 -0800 ---------------------------------------------------------------------- src/launcher/executor.cpp | 2 +- src/tests/slave_tests.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ab6eca0a/src/launcher/executor.cpp ---------------------------------------------------------------------- diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp index d527fec..f00b6fc 100644 --- a/src/launcher/executor.cpp +++ b/src/launcher/executor.cpp @@ -636,7 +636,7 @@ int main(int argc, char** argv) // Get the appropriate shutdown grace period. Duration shutdownTimeout = EXECUTOR_SHUTDOWN_GRACE_PERIOD; - auto value = os::getenv("MESOS_SHUTDOWN_GRACE_PERIOD", false); + string value = os::getenv("MESOS_SHUTDOWN_GRACE_PERIOD", false); if (!value.empty()) { Try<Duration> parse = Duration::parse(value); if (parse.isSome()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/ab6eca0a/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index a85a028..aff9e25 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -1677,7 +1677,7 @@ TEST_F(SlaveTest, MesosExecutorGracefulShutdown) flags.executor_shutdown_grace_period = slave::EXECUTOR_SHUTDOWN_GRACE_PERIOD; // Ensure escalation timeout is more than the maximal reap interval. - auto timeout = slave::getExecutorGracePeriod( + Duration timeout = slave::getExecutorGracePeriod( slave::EXECUTOR_SHUTDOWN_GRACE_PERIOD); EXPECT_LT(process::MAX_REAP_INTERVAL(), timeout);
