From: Moiz Raja <moraja@cisco.com>
Date: Sat, 11 Apr 2015 01:09:47 +0000 (+0000)
Subject: Merge "Add new DeleteEntries class wih long "fromIndex" field"
X-Git-Tag: release/lithium~276
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=e1e2b8993826feb599a77a3464d8f46a6c7897ca

Merge "Add new DeleteEntries class wih long "fromIndex" field"
---

e1e2b8993826feb599a77a3464d8f46a6c7897ca
diff --cc opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
index 2928266648,d2b65db85b..5062f8f6e0
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
@@@ -41,9 -42,9 +41,8 @@@ import org.junit.Before
  import org.junit.Test;
  import org.opendaylight.controller.cluster.DataPersistenceProvider;
  import org.opendaylight.controller.cluster.NonPersistentDataProvider;
 -import org.opendaylight.controller.cluster.datastore.DataPersistenceProviderMonitor;
  import org.opendaylight.controller.cluster.notifications.LeaderStateChanged;
  import org.opendaylight.controller.cluster.notifications.RoleChanged;
- import org.opendaylight.controller.cluster.raft.RaftActor.DeleteEntries;
  import org.opendaylight.controller.cluster.raft.RaftActor.UpdateElectionTerm;
  import org.opendaylight.controller.cluster.raft.base.messages.ApplyJournalEntries;
  import org.opendaylight.controller.cluster.raft.base.messages.ApplyLogEntries;