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

Merge over release changes #1097

Merged
merged 2 commits into from
Nov 12, 2020
Merged

Merge over release changes #1097

merged 2 commits into from
Nov 12, 2020

Conversation

rchiodo
Copy link
Contributor

@rchiodo rchiodo commented Nov 12, 2020

Merge back changes made just for the release branch

  • Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
  • Title summarizes what is changing.
  • Has a news entry file (remember to thank yourself!).
  • Appropriate comments and documentation strings in the code.
  • Has sufficient logging.
  • Has telemetry for enhancements.
  • Unit tests & system/integration tests are added/updated.
  • Test plan is updated as appropriate.
  • package-lock.json has been regenerated by running npm install (if dependencies have changed).

@rchiodo rchiodo requested a review from a team as a code owner November 12, 2020 22:56
@@ -0,0 +1,46 @@
This license applies to the Jupyter Extension for Visual Studio Code.
Source Code for the Jupyter extension is available at https://github.com/microsoft/vscode-jupyter under the MIT license agreement at https://github.com/microsoft/vscode-jupyter/blob/master/LICENSE. Additional license information can be found in our README documentation at https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter. All VS Marketplace extensions, including this Jupyter Extension for Microsoft Visual Studio Code, must also be used consistent with the VS Marketplace Terms of Use at http://aka.ms/VSMarketplace-TOU

Choose a reason for hiding this comment

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

This file had to be called LICENSE, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah it gets updated during the build. I didn't want to submit it to the code as LICENSE.txt for fear it would be confused with the source license.

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