DEX-226 Merge remote-tracking branch 'origin/version-0.15.x' into DEX…

…-226-merge-0.15.x-into-master * Don't use compression * Updated version of akka-stream-kafka to 1.0-RC1
wavesplatform · Feb 8, 2019 · c4022b7 · c4022b7
1 parent 632f704
commit c4022b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -68,7 +68,7 @@ object Dependencies {
     akkaModule("persistence"),
     akkaModule("persistence-tck") % "test",
     "com.github.dnvriend"         %% "akka-persistence-inmemory" % "2.5.15.1" % "test",
-    "com.typesafe.akka"           %% "akka-stream-kafka" % "1.0-M1",
+    "com.typesafe.akka"           %% "akka-stream-kafka" % "1.0-RC1",
     "org.ethereum"                % "leveldbjni-all" % "1.18.3"
   )
 

diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -652,6 +652,8 @@ akka {
 
         # To guarantee the order
         max.in.flight.requests.per.connection = 1
+
+        compression.type = "none"
       }
     }
   }