Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

fix license for blockingconcurrentqueue #19909

Merged
merged 1 commit into from
Feb 18, 2021
Merged

fix license for blockingconcurrentqueue #19909

merged 1 commit into from
Feb 18, 2021

Conversation

mseth10
Copy link
Contributor

@mseth10 mseth10 commented Feb 17, 2021

Currently 3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h is placed under two different licenses 2-clause BSD license and Apache-2.0 license + zlib license. As per the file, it should be under a single license 2-clause BSD license + zlib license

@mseth10 mseth10 requested a review from leezu February 17, 2021 22:16
@mxnet-bot
Copy link

Hey @mseth10 , Thanks for submitting the PR
All tests are already queued to run once. If tests fail, you can trigger one or more tests again with the following commands:

  • To trigger all jobs: @mxnet-bot run ci [all]
  • To trigger specific jobs: @mxnet-bot run ci [job1, job2]

CI supported jobs: [clang, miscellaneous, sanity, unix-cpu, edge, windows-gpu, website, windows-cpu, centos-gpu, unix-gpu, centos-cpu]

Note:
Only following 3 categories can trigger CI :PR Author, MXNet Committer, Jenkins Admin.
All CI tests must pass before the PR can be merged.

@lanking520 lanking520 added the pr-awaiting-testing PR is reviewed and waiting CI build and test label Feb 17, 2021
leezu
leezu approved these changes Feb 17, 2021
View reviewed changes
Copy link
Contributor

@leezu leezu left a comment

Choose a reason for hiding this comment

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

Good catch

@mseth10 mseth10 mentioned this pull request Feb 17, 2021
Merged
@lanking520 lanking520 added pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-merge Review and CI is complete. Ready to Merge and removed pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress labels Feb 17, 2021
@mseth10 mseth10 merged commit ecadeac into apache:master Feb 18, 2021
@mseth10 mseth10 mentioned this pull request Feb 19, 2021
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@leezu leezu leezu approved these changes

Assignees
No one assigned
Labels
pr-awaiting-merge Review and CI is complete. Ready to Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mseth10 @mxnet-bot @leezu @lanking520