Skip to content

[Cherry-Pick] RTF and TXTLicense files#13032

Merged
QilongTang merged 4 commits intoDynamoDS:RC2.15.0_masterfrom
jesusalvino:RC15
Jun 17, 2022
Merged

[Cherry-Pick] RTF and TXTLicense files#13032
QilongTang merged 4 commits intoDynamoDS:RC2.15.0_masterfrom
jesusalvino:RC15

Conversation

@jesusalvino
Copy link
Contributor

@jesusalvino jesusalvino commented Jun 17, 2022 •
edited
Loading

Purpose

Move the following PRs from Master to 2.5 branch about the RTF and TXT License files

#13021
5090cdc

#13027
b971da1

Declarations

Check these if you believe they are true

  • The codebase is in a better state after this PR
  • Is documented according to the standards
  • The level of testing this PR includes is appropriate
  • User facing strings, if any, are extracted into *.resx files
  • All tests pass using the self-service CI.
  • Snapshot of UI changes, if any.
  • Changes to the API follow Semantic Versioning and are documented in the API Changes document.
  • This PR modifies some build requirements and the readme is updated

Release Notes

(FILL ME IN) Brief description of the fix / enhancement. Mandatory section

Reviewers

(FILL ME IN) Reviewer 1 (If possible, assign the Reviewer for the PR)

(FILL ME IN, optional) Any additional notes to reviewers or testers.

FYIs

(FILL ME IN, Optional) Names of anyone else you wish to be notified of

jesusalvino and others added 4 commits June 16, 2022 11:26
@jesusalvino
Dyn 5008 watch node height 4 dictionary (#12989)
991858f 
* WatchTree f Dictionary and Testing

* Watchtree 4 Dictionary Testing resources

* Use of NodeLabel property
@jesusalvino
Merge branch 'RC15' of https://github.com/jesusalvino/Dynamo into RC15
9cc296e
@jesusalvino
Update the License styling (#13021)
0277efd 
* Update the License styling

* Update License txt and rtf
@jesusalvino
Removing duplicate entries (#13027)
b85c670 
* Removing duplicate entries

* Removing duplicate entries

* Cleaning the txt LICENSE
@QilongTang
Copy link
Contributor

QilongTang commented Jun 17, 2022

@jesusalvino Can you fill in the PR template? like which PR this cherry-pick etc?

@jesusalvino jesusalvino mentioned this pull request Jun 17, 2022
Merged
8 tasks
@jesusalvino
Copy link
Contributor Author

jesusalvino commented Jun 17, 2022

@jesusalvino Can you fill in the PR template? like which PR this cherry-pick etc?

Sorry @QilongTang , I think it didn't fill automatically since I have Cherry-Pick 2 commits at the same time, I have just fill some info, please let me know if it's OK.

@QilongTang
Copy link
Contributor

QilongTang commented Jun 17, 2022 •
edited
Loading

@jesusalvino Still it looks like your branch is not clean so by looking at the files changed, it looks like you modified more stuff. Can you delete your branch and remake it then cherry-pick? Otherwise the PR will be confusing to review
Ah got it now, you are cherry picking both PRs

@QilongTang QilongTang added this to the 2.15.0 milestone Jun 17, 2022
@QilongTang QilongTang merged commit 2847997 into DynamoDS:RC2.15.0_master Jun 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@QilongTang QilongTang QilongTang approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.15.0

Development

Successfully merging this pull request may close these issues.

2 participants

@jesusalvino @QilongTang