diff --git a/LICENSE b/LICENSE index 3a5f42c25f..e08fe49722 100644 --- a/LICENSE +++ b/LICENSE @@ -250,6 +250,17 @@ Copyright 2016 AddThis --------------- +pekko-remote contains code from Aeron . + +./remote/src/test/java/org/apache/pekko/remote/artery/aeron/AeronStat.java +./remote/src/test/java/org/apache/pekko/remote/artery/RateReporter.java +./remote/src/main/java/org/apache/pekko/remote/artery/aeron/AeronErrorLog.java + +This code was released under an Apache 2.0 license. +Copyright 2014 - 2016 Real Logic Ltd. + +--------------- + pekko-protobuf contains the sources of Google protobuf 2.5.0 runtime support, moved into the source package `org.apache.pekko.protobuf` so as to avoid version conflicts. For license information see COPYING.protobuf diff --git a/legal/pekko-remote-jar-license.txt b/legal/pekko-remote-jar-license.txt index dec675625d..1fbb21b303 100644 --- a/legal/pekko-remote-jar-license.txt +++ b/legal/pekko-remote-jar-license.txt @@ -207,3 +207,14 @@ written by Austin Appleby. He has placed his code in the public domain. The author has disclaimed copyright to that source code. CountMinSketch.java also contains additional code developed under an Apache 2.0 license. Copyright 2016 AddThis + +--------------- + +pekko-remote contains code from Aeron . + +./remote/src/test/java/org/apache/pekko/remote/artery/aeron/AeronStat.java +./remote/src/test/java/org/apache/pekko/remote/artery/RateReporter.java +./remote/src/main/java/org/apache/pekko/remote/artery/aeron/AeronErrorLog.java + +This code was released under an Apache 2.0 license. +Copyright 2014 - 2016 Real Logic Ltd.