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.

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

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

Merged
merged 28 commits into from
Feb 3, 2021
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
19b9bb3
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Dec 16, 2020
638d8f5
Merge branch 'daos-6338' of https://github.com/daos-stack/daos into d…
GitHuaKuang Jan 19, 2021
33b71d9
Merge branch 'master' into daos-6338
GitHuaKuang Jan 20, 2021
f6cdd20
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Jan 20, 2021
5e2aaf7
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Jan 21, 2021
16c6ee8
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Jan 21, 2021
07cad29
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Jan 22, 2021
42564e3
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Jan 25, 2021
d63cb73
Merge branch 'master' into daos-6338
GitHuaKuang Jan 25, 2021
2fbbeda
Merge branch 'master' into daos-6338
GitHuaKuang Jan 28, 2021
ae6ac3e
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Jan 29, 2021
c9ee878
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Jan 29, 2021
c75cff2
daos-6338
GitHuaKuang Jan 29, 2021
171f970
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang Jan 29, 2021
47c2640
Merge branch 'master' into daos-6338
GitHuaKuang Jan 29, 2021
c7e0601
Merge branch 'master' into daos-6338
GitHuaKuang Jan 29, 2021
154c078
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang Jan 29, 2021
3ebe78d
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang Jan 29, 2021
b1f3d2b
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang Jan 29, 2021
c80ef3d
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang Jan 30, 2021
daf86d0
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang Feb 1, 2021
e9c251d
Merge branch 'master' into daos-6338
GitHuaKuang Feb 1, 2021
3649ff3
daos 6338 DAOS: Change DAOS license text
GitHuaKuang Feb 1, 2021
074657d
daos 6338 DAOS: Change DAOS license text
GitHuaKuang Feb 2, 2021
569b142
Merge branch 'master' into daos-6338
GitHuaKuang Feb 3, 2021
9c65a48
Merge branch 'master' into daos-6338
GitHuaKuang Feb 3, 2021
f4b37a4
daos-6338
GitHuaKuang Feb 3, 2021
563003c
daos-6338
GitHuaKuang Feb 3, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* This file is part of the DAOS Project. It is subject to the license terms
* in the LICENSE file found in the top-level directory of this distribution
* and at https://img.shields.io/badge/License-Apache%202.0-blue.svg.
* and at https://img.shields.io/badge/License-BSD--2--Clause--Patent-blue.svg.
* No part of the DAOS Project, including this file, may be copied, modified,
* propagated, or distributed except according to the terms contained in the
* LICENSE file.
Expand Down
8 changes: 4 additions & 4 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Upstream-Name: cart
Source: https://github.com/daos-stack/cart

Files: *
Copyright: Copyright 2016-2019 Intel Corporation <[email protected]>
License: Intel_Open_Source_License
Copyright (C) 2016-2019 Intel Corporation
Copyright: Copyright 2016-2021 Intel Corporation <[email protected]>
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
License: BSD-2-Clause-Patent
Copyright (C) 2016-2021 Intel Corporation
All rights reserved.
.
Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -61,4 +61,4 @@ License: GPL-2+
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".
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
7 changes: 5 additions & 2 deletions utils/rpms/daos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

Name: daos
Version: 1.1.2.1
Release: 7%{?relval}%{?dist}
Release: 8%{?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.

URL: https//github.com/daos-stack/daos
Source0: %{name}-%{version}.tar.gz

Expand Down Expand Up @@ -409,6 +409,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
%{_libdir}/*.a

%changelog
* Mon Feb 3 2021 Hua Kuang <[email protected]> 1.1.2.1-8
- Changed License from Apache to BSD-2-Clause-Patent in this file

* Thu Jan 28 2021 Phillip Henderson <[email protected]> 1.1.2.1-7
- Change ownership and permissions for the /etc/daos/certs directory.

Expand Down