From c13dc9b62ca1f1bea586f1aea066109041e9ac13 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 30 Sep 2026 20:14:37 +0100 Subject: [PATCH] Attribute OwSink.combine to Akka's Sink.combine OwSink.combine in DockerToActivationFileLogStore.scala was adapted from Sink.combine in Akka 2.5.6 (Apache-2.0) when Apache OpenWhisk added it in 2017 (apache/openwhisk d69f8db02). Keep the upstream Lightbend copyright notice alongside the ASF header, as ConcurrentMapBackedCache.scala does for the code it derives from Spray. Part of apache/openserverless#265. Co-Authored-By: Claude Opus 5.5 (1M context) --- .../logging/DockerToActivationFileLogStore.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openwhisk/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/logging/DockerToActivationFileLogStore.scala b/openwhisk/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/logging/DockerToActivationFileLogStore.scala index 83267ba..07ac768 100644 --- a/openwhisk/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/logging/DockerToActivationFileLogStore.scala +++ b/openwhisk/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/logging/DockerToActivationFileLogStore.scala @@ -15,6 +15,11 @@ * limitations under the License. */ +/* + * OwSink.combine is derived from Sink.combine in Akka 2.5.6: + * Copyright (C) 2014-2017 Lightbend Inc. + */ + package org.apache.openwhisk.core.containerpool.logging import java.nio.file.{Files, Path, Paths}