Skip to content
This repository has been archived by the owner on Jun 14, 2024. It is now read-only.

LICENSE: use CC-by-4.0 for docs and Apache 2 for code #63

Merged
merged 2 commits into from
Jul 23, 2021

Conversation

chalin
Copy link
Collaborator

@chalin chalin commented Jul 22, 2021

@chalin chalin force-pushed the chalin-license-2021-07-22 branch from fcbbe88 to 13b6c18 Compare July 22, 2021 13:55
@celestehorgan
Copy link
Contributor

@chalin can you rebase this? then it should be good to merge.

@nate-double-u nate-double-u merged commit bd49181 into cncf:main Jul 23, 2021
@chalin chalin deleted the chalin-license-2021-07-22 branch July 23, 2021 18:31
@chalin
Copy link
Collaborator Author

chalin commented Jul 23, 2021

@chalin can you rebase this? then it should be good to merge.

I updated the branch via the GH web interface. (I didn't think that a rebase was necessary given that there weren't any conflicts). I don't know if that achieved the result you wanted.

More generally, see the #76 question regarding merge vs. squash & merge.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use license appropriate for websites: CC-by-4.0 for docs and Apache 2 for code
3 participants