From 6722539867336daa25e41b33bd01f53a1978013f Mon Sep 17 00:00:00 2001
From: Bartosz Sypytkowski <b.sypytkowski@gmail.com>
Date: Sun, 5 Feb 2017 10:01:40 +0100
Subject: [PATCH] post-rebase fixes

---
 .../Akka.Remote/Transport/DotNetty/DotNettyTransport.cs    | 7 +++++++
 .../Transport/DotNetty/DotNettyTransportSettings.cs        | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransport.cs b/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransport.cs
index 6eb2c7bce6b..ce29c764f07 100644
--- a/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransport.cs
+++ b/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransport.cs
@@ -122,6 +122,13 @@ protected DotNettyTransport(ActorSystem system, Config config)
         {
             System = system;
             Config = config;
+
+            if (system.Settings.Config.HasPath("akka.remote.helios.tcp"))
+            {
+                var heliosFallbackConfig = system.Settings.Config.GetConfig("akka.remote.helios.tcp");
+                config = heliosFallbackConfig.WithFallback(config);
+            }
+
             Settings = DotNettyTransportSettings.Create(config);
             Log = Logging.GetLogger(System, GetType());
             serverEventLoopGroup = new MultithreadEventLoopGroup(Settings.ServerSocketWorkerPoolSize);
diff --git a/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs b/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs
index c5d9e446426..d5639c357e7 100644
--- a/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs
+++ b/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs
@@ -19,7 +19,7 @@
 
 namespace Akka.Remote.Transport.DotNetty
 {
-    public sealed class DotNettyTransportSettings
+    internal sealed class DotNettyTransportSettings
     {
         public static DotNettyTransportSettings Create(ActorSystem system)
         {
@@ -219,13 +219,13 @@ private static int ComputeWorkerPoolSize(Config config)
             ByteOrder = byteOrder;
         }
     }
-    public enum TransportMode
+    internal enum TransportMode
     {
         Tcp,
         Udp
     }
 
-    public sealed class SslSettings
+    internal sealed class SslSettings
     {
         public static readonly SslSettings Empty = new SslSettings();
         public static SslSettings Create(Config config)