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

change the license format #219

Merged
merged 3 commits into from
May 5, 2018
Merged

change the license format #219

merged 3 commits into from
May 5, 2018

Conversation

kinggoesgaming
Copy link
Member

I'm submitting a ...

  • bug fix
  • feature enhancement
  • deprecation or removal
  • refactor

Description

Changed license field from MIT/Apache-2.0 to Apache-2.0 OR MIT

Motivation

rust-lang/cargo#4898 deprecated the / syntax for licenses, instead opting for AND and OR keywords.

Tests

N/A

Related Issue(s)

rust-lang/cargo#4898

Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
@kinggoesgaming kinggoesgaming added this to the 0.6.4 milestone May 5, 2018
@kinggoesgaming kinggoesgaming self-assigned this May 5, 2018
@Dylan-DPC-zz
Copy link
Member

bors: r+

bors bot added a commit that referenced this pull request May 5, 2018
219: change the license format r=Dylan-DPC a=kinggoesgaming

**I'm submitting a ...**
  - [ ] bug fix
  - [ ] feature enhancement
  - [ ] deprecation or removal
  - [ ] refactor

# Description
Changed license field from `MIT/Apache-2.0` to `Apache-2.0 OR MIT`

# Motivation
rust-lang/cargo#4898 deprecated the `/` syntax for licenses, instead opting for `AND` and `OR` keywords.

# Tests
N/A

# Related Issue(s)
rust-lang/cargo#4898


Co-authored-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Co-authored-by: Dylan DPC <dylan.dpc@gmail.com>
@Dylan-DPC-zz
Copy link
Member

bors: r+

@bors
Copy link
Contributor

bors bot commented May 5, 2018

Canceled

@kinggoesgaming
Copy link
Member Author

bors: r+

bors bot added a commit that referenced this pull request May 5, 2018
219: change the license format r=kinggoesgaming a=kinggoesgaming

**I'm submitting a ...**
  - [ ] bug fix
  - [ ] feature enhancement
  - [ ] deprecation or removal
  - [ ] refactor

# Description
Changed license field from `MIT/Apache-2.0` to `Apache-2.0 OR MIT`

# Motivation
rust-lang/cargo#4898 deprecated the `/` syntax for licenses, instead opting for `AND` and `OR` keywords.

# Tests
N/A

# Related Issue(s)
rust-lang/cargo#4898


Co-authored-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Co-authored-by: Dylan DPC <dylan.dpc@gmail.com>
@bors
Copy link
Contributor

bors bot commented May 5, 2018

@bors bors bot merged commit 0fd34a4 into master May 5, 2018
@kinggoesgaming kinggoesgaming deleted the license-format-change branch May 5, 2018 19:29
LinusU pushed a commit to LinusU/uuid that referenced this pull request Feb 26, 2020
* eslint

* s/;//

* eslint

* s/;//

* Add eqeqeq, brace-style, and one-var rules

* fix broken test (not related to eslint)

* fix test for real
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants