Skip to content

Commit

Permalink
acknowledge Lightbend in LICENSE
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Oct 3, 2024
1 parent a478d3b commit 13fe6ff
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
12 changes: 10 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This software is licensed under the Apache 2 license, quoted below.

Copyright © 2013-2014 the kamon project <http://kamon.io>
Copyright © 2013-2024 the kamon project <http://kamon.io>

Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
Expand All @@ -12,4 +12,12 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.
the License.

------------------------------------------------------------------------

The kamon-akka and kamon-pekko modules and other modules prefixed
with "kamon-akka" and "kamon-pekko" contain code from the Akka project
<https://akka.io/> which is licensed under the Apache License, Version 2.0.
This code is from before Akka changed to the Business Source License 1.1.
Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
6 changes: 6 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Kamon
Copyright © 2013-2024 the kamon project <http://kamon.io>

This product includes software developed at Lightbend (Akka <https://akka.io/>)
under the Apache License, Version 2.0 License (before they changed to the Business Source License 1.1).
Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>

0 comments on commit 13fe6ff

Please sign in to comment.