Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Daos 6338 SWLC: Change DAOS license text #6 #4475

Merged
merged 20 commits into from
Feb 1, 2021
Merged

Daos 6338 SWLC: Change DAOS license text #6 #4475

merged 20 commits into from
Feb 1, 2021

Conversation

GitHuaKuang
Copy link
Contributor

Updated misc files.

@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
19b9bb3 
For these directoriesi and their sub_dirs:
daos/src/vos
daos/src/vea
daos/src/utils
daos/src/tests
daos/src/security

Skip-build: true
Skip-test: true

Change-Id: I671260a65927385f1aa1404edfbfbf989d9433a2
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
Merge branch 'daos-6338' of https://github.com/daos-stack/daos into d…
638d8f5 
…aos-6338

Skip-build: true
Skip-test: true

Signed-off-by: Hua Kuang <hua.kuang@intel.com>

Conflicts:
	src/tests/ftest/pool/multiple_creates_test.py

Change-Id: I59f0bf4530aae31197786dfa09fd47def5ed22eb
@GitHuaKuang
Merge branch 'master' into daos-6338
33b71d9
@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
f6cdd20 
Updated DAOS top LICENSE file to match description in https://spdx.org/licenses/BSD-2-Clause-Patent.html

Change-Id: I193d224ca52ee8d45b3092c4d5cedae83a382002
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
5e2aaf7 
Apply  Copyright year change to .py files
Skip-build: true
Skip-test: true

Change-Id: I55effb3fd6f177cd7e128524ca20ecac1d57b015
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
16c6ee8 
    Changed all .py file in src/tests/ftest after Copyright date updated.

    Skip-build: true
    Skip-test: true

Change-Id: Iefdec06dbe031ddbcbb2df8928767b4cfc83b6b0
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
07cad29 
Updated LICENSE

Skip-build: true
Skip-test: true

Change-Id: I3ff41fc6050006a97fbea114ef1964739b2a4163
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
42564e3 
Minor change to LICENSE

Skip-build: true
Skip-test: true

Change-Id: I7520a1762df39d2f3dbef3e46283982c29a82918
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
Merge branch 'master' into daos-6338
d63cb73 
Skip-test: true
Skip-build: true
@GitHuaKuang
Merge branch 'master' into daos-6338
2fbbeda 
Signed-off-by: Hua Kuang <hua.kuang@intel.com>

Conflicts:
	utils/githooks/pre-commit

Change-Id: I3040d7270ae301c9dd50436f28b4fdf663ad8268
@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
ae6ac3e 
Updated mainly .java + some found missed files

Skip-build: true
Skip-test: true

Change-Id: Iade0472c36f2a02cf7df72b19f52c3ac0097d5b8
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
c9ee878 
Updated mainly .java + some found missed files

Skip-build: true
Skip-test: true

Change-Id: I5735f9dda6c8b27df207a4964b83539578b25835
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
daos-6338
c75cff2 
added .java handling in utils/github/pre-commit

Change-Id: Id7163e3ee9b838039b26f0a969f4ec03823a981e
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
DAOS-6338 DAOS:Change DAOS license text
171f970 
Updated mainly .java + some found missed files

Skip-build: true
Skip-test: true

Change-Id: Ie98d1abd33632dd77da64e1632eb2d2c30f370f2
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
@GitHuaKuang
Merge branch 'master' into daos-6338
47c2640
@GitHuaKuang
Merge branch 'master' into daos-6338
c7e0601
@GitHuaKuang
Daos 6338 DAOS: Change DAOS license text
154c078 
Updated misc files

Skip-build: true
Skip-test: true

Change-Id: I6e3413b9b2d53ecc159789a24995e4ecbca44ac6
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
daosbuild1
daosbuild1 reviewed Jan 29, 2021
View reviewed changes
Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. No errors found by checkpatch.

jolivier23
jolivier23 approved these changes Jan 29, 2021
View reviewed changes
src/utils/ctl/SConscript
# provided in Contract No. 8F-30005.
# Any reproduction of computer software, computer software documentation, or
# portions thereof marked with this legend must also reproduce the markings.
# SPDX-License-Identifier: BSD-2-Clause-Patent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2021?

src/utils/self_test/SConscript
# provided in Contract No. 8F-30005.
# Any reproduction of computer software, computer software documentation, or
# portions thereof marked with this legend must also reproduce the markings.
# SPDX-License-Identifier: BSD-2-Clause-Patent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2021?

jolivier23
jolivier23 requested changes Jan 29, 2021
View reviewed changes
Copy link
Contributor

@jolivier23 jolivier23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, meant to request changes

@GitHuaKuang
Daos 6338 DAOS: Change DAOS license text
3ebe78d 
Updated Copyright dates to some files that not covered by pre-commit

Skip-build: true
Skip-test: true

Change-Id: I876e33daabef29bc94e8c987e4ca651319c89ba4
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
daosbuild1
daosbuild1 reviewed Jan 29, 2021
View reviewed changes
Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. No errors found by checkpatch.

jolivier23
jolivier23 previously approved these changes Jan 29, 2021
View reviewed changes
jbrosenz
jbrosenz suggested changes Jan 29, 2021
View reviewed changes
...client/java/hadoop-daos/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem Outdated
@@ -1,22 +1,5 @@
# (C) Copyright 2018-2020 Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to 2021

src/tests/suite/io_conf/daos_io_conf_1 Outdated
@@ -1,24 +1,7 @@
#/*
# * (C) Copyright 2018-2019 Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to 2021

src/tests/suite/io_conf/daos_io_conf_2 Outdated
@@ -1,24 +1,7 @@
#/*
## * (C) Copyright 2018-2019 Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to 2021

src/tests/suite/io_conf/daos_io_conf_3 Outdated
@@ -1,24 +1,7 @@
#/*
## * (C) Copyright 2018-2019 Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to 2021

src/tests/suite/io_conf/daos_io_conf_4 Outdated
@@ -1,24 +1,7 @@
#/*
## * (C) Copyright 2018-2019 Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to 2021

src/tests/suite/io_conf/daos_io_conf_5 Outdated
@@ -1,24 +1,7 @@
#/*
## * (C) Copyright 2018-2019 Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to 2021

@GitHuaKuang
Daos 6338 DAOS: Change DAOS license text
b1f3d2b 
Skip-build: true
Skip-test: true

Change-Id: Ie026372ee2d7d1eda2e61bf8cc1ce41accd50488
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
daosbuild1
daosbuild1 reviewed Jan 29, 2021
View reviewed changes
Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. No errors found by checkpatch.

jbrosenz
jbrosenz previously approved these changes Jan 29, 2021
View reviewed changes
@GitHuaKuang GitHuaKuang requested a review from a team January 29, 2021 22:38
jolivier23
jolivier23 requested changes Jan 29, 2021
View reviewed changes
src/gurt/tests/SConscript Outdated
@@ -1,23 +1,7 @@
# (C) Copyright 2020 Intel Corporation.
# (C) Copyright 2021 Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2020-2021...Actually, parts of this code are much older than that

Copy link
Contributor Author

@GitHuaKuang GitHuaKuang Jan 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, perhaps moved to this location last year, or newly created?
b692543 (David M. Moreno 2020-08-03 17:55:24 -0500 4) #
b692543 (David M. Moreno 2020-08-03 17:55:24 -0500 5) """Unit tests"""

Like the one I just copied, not edited: src/control/lib/ipmctl/LICENSE

jolivier23
jolivier23 reviewed Jan 29, 2021
View reviewed changes
src/control/lib/ipmctl/LICENSE Outdated
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.
Copyright (c) 2021 Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mjmac @tanabarr why does this file exist ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From @mjmac :

"I think the license file in there is vestigial from when it lived in an external repo"

I think we should probably just remove the file

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes please remove the file, it exists from when it was created as an external repo

@GitHuaKuang
Daos 6338 DAOS: Change DAOS license text
c80ef3d 
Skip-build: true
Skip-test: true

Change-Id: I8d87cbf84b5b2300293f5e7e89ea7fc8649a1a4f
Signed-off-by: Hua Kuang <hua.kuang@intel.com>
daosbuild1
daosbuild1 reviewed Jan 30, 2021
View reviewed changes
Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. No errors found by checkpatch.

@GitHuaKuang GitHuaKuang requested a review from a team January 31, 2021 15:33
@jolivier23 jolivier23 merged commit 1270885 into master Feb 1, 2021
@jolivier23 jolivier23 deleted the daos-6338 branch February 1, 2021 15:15
@GitHuaKuang GitHuaKuang changed the title Daos 6338 DAOS:Change DAOS license text #6 Daos 6338 SWLC: Change DAOS license text #6 Feb 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daosbuild1 daosbuild1 daosbuild1 left review comments

@jolivier23 jolivier23 jolivier23 approved these changes

@jbrosenz jbrosenz jbrosenz approved these changes

@cibervicho cibervicho Awaiting requested review from cibervicho

@tanabarr tanabarr Awaiting requested review from tanabarr

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@GitHuaKuang @tanabarr @jbrosenz @jolivier23 @daosbuild1