Merge branch 'dev' into v1.3.6-release-notes

Danthar · web-flow · commit ad8dda9cc913 · 2018-04-30T08:19:29.000+02:00
diff --git a/src/Akka.Logger.Serilog/SerilogLoggingAdapter.cs b/src/Akka.Logger.Serilog/SerilogLoggingAdapter.cs
@@ -82,7 +82,7 @@ private SerilogLoggingAdapter(LoggingBus bus, string logSource, Type logClass, C
         /// </summary>
         /// <param name="format">The message that is being logged.</param>
         /// <param name="args">An optional list of items used to format the message.</param>
-        public virtual void Error(string format, params object[] args)
+        public new void Error(string format, params object[] args)
         {
             base.Error(format, BuildArgs(args));
         }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private SerilogLoggingAdapter(LoggingBus bus, string logSource, Type logClass, C`
`82`	`82`	`/// </summary>`
`83`	`83`	`/// <param name="format">The message that is being logged.</param>`
`84`	`84`	`/// <param name="args">An optional list of items used to format the message.</param>`
`85`		`- public virtual void Error(string format, params object[] args)`
	`85`	`+ public new void Error(string format, params object[] args)`
`86`	`86`	`{`
`87`	`87`	`base.Error(format, BuildArgs(args));`
`88`	`88`	`}`