Merge branch 'redis-init-rc-fix' into HEAD

# Conflicts: # version.sbt
AVSystem · Jun 12, 2018 · 414a802 · 414a802
2 parents c50245e + d1b5dd4
commit 414a802
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/commons-redis/src/main/scala/com/avsystem/commons/redis/actor/ClusterMonitoringActor.scala b/commons-redis/src/main/scala/com/avsystem/commons/redis/actor/ClusterMonitoringActor.scala
@@ -49,7 +49,7 @@ final class ClusterMonitoringActor(
   private val connections = new mutable.HashMap[NodeAddress, ActorRef]
   private val clients = new mutable.HashMap[NodeAddress, RedisNodeClient]
   private var state = Opt.empty[ClusterState]
-  private var suspendUntil = Deadline.now
+  private var suspendUntil = Deadline(Duration.Zero)
   private var scheduledRefresh = Opt.empty[Cancellable]
   private val seedFailures = new ArrayBuffer[Throwable]
 

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "1.27.7"
+version in ThisBuild := "1.27.8"