-
Notifications
You must be signed in to change notification settings - Fork 304
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
Changes from 23 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 638d8f5
Merge branch 'daos-6338' of https://github.com/daos-stack/daos into d…
GitHuaKuang 33b71d9
Merge branch 'master' into daos-6338
GitHuaKuang f6cdd20
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang 5e2aaf7
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang 16c6ee8
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang 07cad29
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang 42564e3
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang d63cb73
Merge branch 'master' into daos-6338
GitHuaKuang 2fbbeda
Merge branch 'master' into daos-6338
GitHuaKuang ae6ac3e
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang c9ee878
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang c75cff2
daos-6338
GitHuaKuang 171f970
DAOS-6338 DAOS:Change DAOS license text
GitHuaKuang 47c2640
Merge branch 'master' into daos-6338
GitHuaKuang c7e0601
Merge branch 'master' into daos-6338
GitHuaKuang 154c078
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang 3ebe78d
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang b1f3d2b
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang c80ef3d
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang daf86d0
Daos 6338 DAOS: Change DAOS license text
GitHuaKuang e9c251d
Merge branch 'master' into daos-6338
GitHuaKuang 3649ff3
daos 6338 DAOS: Change DAOS license text
GitHuaKuang 074657d
daos 6338 DAOS: Change DAOS license text
GitHuaKuang 569b142
Merge branch 'master' into daos-6338
GitHuaKuang 9c65a48
Merge branch 'master' into daos-6338
GitHuaKuang f4b37a4
daos-6338
GitHuaKuang 563003c
daos-6338
GitHuaKuang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,10 +6,10 @@ | |
|
||
Name: daos | ||
Version: 1.1.2.1 | ||
Release: 6%{?relval}%{?dist} | ||
Release: 7%{?relval}%{?dist} | ||
Summary: DAOS Storage Engine | ||
|
||
License: Apache | ||
License: BSD-2-Clause-Patent | ||
URL: https//github.com/daos-stack/daos | ||
Source0: %{name}-%{version}.tar.gz | ||
|
||
|
@@ -409,6 +409,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent | |
%{_libdir}/*.a | ||
|
||
%changelog | ||
* Mon Feb 1 2021 Hua Kuang <[email protected]> 1.1.2.1-7 | ||
- Changed License from Apache to BSD-2-Clause-Patent in this file | ||
|
||
* Sat Jan 23 2021 Alexander Oganezov <[email protected]> 1.1.2.1-6 | ||
- Update to mercury v2.0.1rc1 | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, yes.