diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-24 13:38:20 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-24 13:38:20 +0200 |
commit | 8c0633f4d9055c6710b170e40bb006ed8fc3a0c0 (patch) | |
tree | 20a3e6673df64a4c42408079dd3c682e2bf4f211 /same/src/main/java/com/orbekk/paxos | |
parent | ae8791a096626b0196c63e4d9cb68f7a18ad86b0 (diff) |
Fix master takeover code.
– Use the new services to send a MasterTakeover().
– Remove some old broadcast code.
– Remove MasterProposerTest because this functionality is well enough
covered by the functional test.
– Remove HTTP services from PaxosServiceFunctionalTest.
– Fix master takeover test.
Diffstat (limited to 'same/src/main/java/com/orbekk/paxos')
-rw-r--r-- | same/src/main/java/com/orbekk/paxos/MasterProposer.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/same/src/main/java/com/orbekk/paxos/MasterProposer.java b/same/src/main/java/com/orbekk/paxos/MasterProposer.java index dbfd3c1..bc4f18d 100644 --- a/same/src/main/java/com/orbekk/paxos/MasterProposer.java +++ b/same/src/main/java/com/orbekk/paxos/MasterProposer.java @@ -1,8 +1,5 @@ package com.orbekk.paxos; -import static com.orbekk.same.StackTraceUtil.throwableToString; - -import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; @@ -10,7 +7,6 @@ import java.util.concurrent.Future; import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.runner.Request; import org.slf4j.Logger; import org.slf4j.LoggerFactory; |