Repository: mesos Updated Branches: refs/heads/master c5b508489 -> af6309f1c
Adjusted lifetimes of member variables. This correctly reflects the lifetime dependencies among `Master::storage`, `Master::state` and `Master::registrar`. Review: https://reviews.apache.org/r/45749/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/af6309f1 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/af6309f1 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/af6309f1 Branch: refs/heads/master Commit: af6309f1c0a05937508e4e7f2b495920359602bb Parents: c5b5084 Author: Benjamin Bannier <benjamin.bann...@mesosphere.io> Authored: Wed Apr 6 12:10:35 2016 -0700 Committer: Michael Park <mp...@apache.org> Committed: Wed Apr 6 12:10:35 2016 -0700 ---------------------------------------------------------------------- src/tests/cluster.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/af6309f1/src/tests/cluster.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cluster.hpp b/src/tests/cluster.hpp index 91d3998..2598140 100644 --- a/src/tests/cluster.hpp +++ b/src/tests/cluster.hpp @@ -115,10 +115,10 @@ private: process::Owned<MasterContender> contender; process::Owned<MasterDetector> detector; process::Owned<log::Log> log; + process::Owned<state::Storage> storage; + process::Owned<state::protobuf::State> state; process::Owned<master::Registrar> registrar; process::Owned<master::Repairer> repairer; - process::Owned<state::protobuf::State> state; - process::Owned<state::Storage> storage; Option<std::shared_ptr<process::RateLimiter>> slaveRemovalLimiter;