You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by et...@apache.org on 2023/01/31 07:10:17 UTC
[incubator-celeborn] branch CELEBORN-224-FOLLOWUP-2 updated (7ef0da11 -> 618d21c1)
This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a change to branch CELEBORN-224-FOLLOWUP-2
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
discard 7ef0da11 Correct license and notices.
new 618d21c1 Correct license and notices.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7ef0da11)
\
N -- N -- N refs/heads/CELEBORN-224-FOLLOWUP-2 (618d21c1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 3 +++
1 file changed, 3 insertions(+)
[incubator-celeborn] 01/01: Correct license and notices.
Posted by et...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a commit to branch CELEBORN-224-FOLLOWUP-2
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
commit 618d21c15919ff62c75ba978b5659b6021d28f8a
Author: Ethan Feng <et...@apache.org>
AuthorDate: Wed Jan 25 13:08:57 2023 +0800
Correct license and notices.
---
.scalafmt.conf | 17 +++++++++++++++++
LICENSE | 12 ++++++++++++
NOTICE | 2 ++
NOTICE-binary | 2 +-
.../network/server/memory/ReadBufferListener.java | 13 +++++++------
5 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index d82ea07c..2df0e202 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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 the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+
version = 3.1.1
runner.dialect=scala212
project.git=true
diff --git a/LICENSE b/LICENSE
index 261eeb9e..818dcd14 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,15 @@
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.
+
+
+------------------------------------------------------------------------------------
+This product bundles various third-party components under other open source licenses.
+This section summarizes those components and their licenses. See licenses/
+for text of these licenses.
+
+
+Apache Software Foundation License 2.0
+--------------------------------------
+
+common/src/main/java/org/apache/celeborn/common/network/util/LimitedInputStream.java
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index b1dcec68..d3e2fc79 100644
--- a/NOTICE
+++ b/NOTICE
@@ -5,3 +5,5 @@ Copyright 2022-2023 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
+Apache Spark
+Copyright 2014 and onwards The Apache Software Foundation.
\ No newline at end of file
diff --git a/NOTICE-binary b/NOTICE-binary
index 1f4700cd..2ccec970 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -63,4 +63,4 @@ Apache Ratis Server API
Copyright 2017-2020 The Apache Software Foundation
Apache Ratis Thirdparty Miscellaneous
-Copyright 2017-2020 The Apache Software Foundation
\ No newline at end of file
+Copyright 2017-2020 The Apache Software Foundation
diff --git a/common/src/main/java/org/apache/celeborn/common/network/server/memory/ReadBufferListener.java b/common/src/main/java/org/apache/celeborn/common/network/server/memory/ReadBufferListener.java
index 8ecc3d22..1321d3db 100644
--- a/common/src/main/java/org/apache/celeborn/common/network/server/memory/ReadBufferListener.java
+++ b/common/src/main/java/org/apache/celeborn/common/network/server/memory/ReadBufferListener.java
@@ -1,11 +1,12 @@
/*
- * Copyright 2021 The Flink Remote Shuffle Project
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 the License at
*
- * 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 the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,