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 #7 #4492

Merged
merged 28 commits into from
Feb 3, 2021
Merged

Daos 6338 SWLC: Change DAOS license text #7 #4492

merged 28 commits into from
Feb 3, 2021

Conversation

GitHuaKuang
Copy link
Contributor

Found few missed files to update.

Skip-build: true
Skip-test: true

@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 <[email protected]>
@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 <[email protected]>

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 <[email protected]>
@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 <[email protected]>
@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 <[email protected]>
@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 <[email protected]>
@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 <[email protected]>
@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 <[email protected]>

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 <[email protected]>
@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 <[email protected]>
@GitHuaKuang
daos-6338
c75cff2 
added .java handling in utils/github/pre-commit

Change-Id: Id7163e3ee9b838039b26f0a969f4ec03823a981e
Signed-off-by: Hua Kuang <[email protected]>
@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 <[email protected]>
@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 <[email protected]>
@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 <[email protected]>
@GitHuaKuang
Daos 6338 DAOS: Change DAOS license text
b1f3d2b 
Skip-build: true
Skip-test: true

Change-Id: Ie026372ee2d7d1eda2e61bf8cc1ce41accd50488
Signed-off-by: Hua Kuang <[email protected]>
@GitHuaKuang
Daos 6338 DAOS: Change DAOS license text
c80ef3d 
Skip-build: true
Skip-test: true

Change-Id: I8d87cbf84b5b2300293f5e7e89ea7fc8649a1a4f
Signed-off-by: Hua Kuang <[email protected]>
@GitHuaKuang
Daos 6338 DAOS: Change DAOS license text
daf86d0 
Found few missed files to update.

Skip-build: true
Skip-test: true

Change-Id: Ica9a3aad84f9b1d071e37ec4490d3ccc838c6935
Signed-off-by: Hua Kuang <[email protected]>
daosbuild1
daosbuild1 reviewed Feb 1, 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
Merge branch 'master' into daos-6338
e9c251d 
Skip-build: true
Skip-test: true
daosbuild1
daosbuild1 reviewed Feb 1, 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 requested changes Feb 1, 2021
View reviewed changes
utils/rpms/daos.spec
@@ -9,7 +9,7 @@ Version: 1.1.2.1
Release: 6%{?relval}%{?dist}
Summary: DAOS Storage Engine

License: Apache
License: 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.

You need to bump the release on line 9 and add a change log entry

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, yes.

@GitHuaKuang
daos 6338 DAOS: Change DAOS license text
3649ff3 
Updated version and log in utils/rpms/daos.spec

Skip-build: true
Skip-test: true

Change-Id: I5376658658aee93b25e56ac22b101c26c77a04ca
Signed-off-by: Hua Kuang <[email protected]>
daosbuild1
daosbuild1 reviewed Feb 1, 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
Merge branch 'master' into daos-6338
569b142 
Skip-build: true
Skip-test: true

Signed-off-by: Hua Kuang <[email protected]>

Conflicts:
	utils/rpms/daos.spec

Change-Id: I8c60c039df015393d73f9817d21fbec8a2c410c5
daosbuild1
daosbuild1 reviewed Feb 3, 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
Merge branch 'master' into daos-6338
9c65a48 
Bump up version in daos.spec

Skip-build: true
Skip-test: true

Change-Id: Ib4f9a89ebe36a6642a1a1fd64e2576c4a3e757a1
Signed-off-by: Hua Kuang <[email protected]>
daosbuild1
daosbuild1 reviewed Feb 3, 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 Feb 3, 2021
View reviewed changes
mjmac
mjmac previously approved these changes Feb 3, 2021
View reviewed changes
Copy link
Contributor

@mjmac mjmac left a comment

Choose a reason for hiding this comment

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

LGTM

brianjmurrell
brianjmurrell suggested changes Feb 3, 2021
View reviewed changes
Copy link
Contributor

@brianjmurrell brianjmurrell left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Note that in debian/copyright, there are multiple licences with path globs so that one can have different licenses for different files. Currently, while that file is saying BSD-2-Clause-Patent for *, it is also then overriding that and saying GPL-2+ for for debian/*:

daos/debian/copyright

Lines 47 to 64 in 9c65a48

Files: debian/*
Copyright: 2019 daos-stack <[email protected]>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

Is this really what we want? If not, delete lines 45 to the end of the file.

Note that if you do modify debian/copyright to fix the above, it would be worthwhile changing cart on line 2:

daos/debian/copyright

Line 2 in 9c65a48

Upstream-Name: cart
to daos.

You should also add a new entry to debian/changelog, bumping up the release there the same way you did with the daos.spec file.

cibervicho
cibervicho previously approved these changes Feb 3, 2021
View reviewed changes
@GitHuaKuang
daos-6338
f4b37a4 
update debian files

Skip-build: true
Skip-test: true

Change-Id: Id3ad80fefd7b7dededaf2693110176db03d8c8b3
Signed-off-by: Hua Kuang <[email protected]>
@GitHuaKuang GitHuaKuang dismissed stale reviews from cibervicho, mjmac, and jolivier23 via f4b37a4 February 3, 2021 17:03
@GitHuaKuang
daos-6338
563003c 
Updated changelogs

Skip-build: true
Skip-test: true

Change-Id: I13d2a81320b76f4790019030d967d7af51772335
Signed-off-by: Hua Kuang <[email protected]>
daosbuild1
daosbuild1 reviewed Feb 3, 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.

daosbuild1
daosbuild1 reviewed Feb 3, 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 February 3, 2021 23:16
@jolivier23 jolivier23 merged commit 455bf6f into master Feb 3, 2021
@jolivier23 jolivier23 deleted the daos-6338 branch February 3, 2021 23:51
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

@cibervicho cibervicho cibervicho approved these changes

@brianjmurrell brianjmurrell Awaiting requested review from brianjmurrell

@mjmac mjmac Awaiting requested review from mjmac

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@GitHuaKuang @brianjmurrell @mjmac @cibervicho @jolivier23 @daosbuild1