Skip to content

avoid namespace collisions when collapsing custom nodes RC 2.1#9357

Merged
mjkkirschner merged 2 commits intoDynamoDS:RC2.1.0_masterfrom
mjkkirschner:2.1customNode_namespace
Jan 2, 2019
Merged

avoid namespace collisions when collapsing custom nodes RC 2.1#9357
mjkkirschner merged 2 commits intoDynamoDS:RC2.1.0_masterfrom
mjkkirschner:2.1customNode_namespace

Conversation

@mjkkirschner
Copy link
Member

@mjkkirschner mjkkirschner commented Jan 2, 2019

Purpose

Cherry pick:
#9330
to 2.1

Declarations

Check these if you believe they are true

  • The code base 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.

Reviewers

@QilongTang

FYIs

@smangarole

@mjkkirschner
fix merge conflicts
d1bffe3
@mjkkirschner
Merge remote-tracking branch 'upstream/RC2.1.0_master' into 2.1custom…
16f7b23 
…Node_namespace

# Conflicts:
#	src/DynamoCore/Core/CustomNodeManager.cs
@QilongTang
Copy link
Contributor

QilongTang commented Jan 2, 2019 •
edited
Loading

@mjkkirschner Now I feel really sorry.. I forgot to check your original PR that since most of the files put system usings ahead of custom usings, so we sort it that way. Maybe just merge it as it is so master and rc branch aligns and we can do another sweep different time

@QilongTang
Copy link
Contributor

QilongTang commented Jan 2, 2019

LGTM

@QilongTang QilongTang added the LGTM Looks good to me label Jan 2, 2019
@mjkkirschner mjkkirschner merged commit 1995db0 into DynamoDS:RC2.1.0_master Jan 2, 2019
mjkkirschner added a commit that referenced this pull request Jan 3, 2019
@mjkkirschner
Revert "fix merge conflicts (#9357)"
5d51769 
This reverts commit 1995db0.
@mjkkirschner mjkkirschner mentioned this pull request Jan 3, 2019
Merged
mjkkirschner added a commit that referenced this pull request Jan 3, 2019
@mjkkirschner
Revert "avoid namespace collisions when collapsing custom nodes RC 2.…
b121ab2 
…1" (#9359)

* Revert "Revert "Heterogeneous list update gives infinite loop (#9334)" (#9355)"

This reverts commit dea378c.

* Revert "fix merge conflicts (#9357)"

This reverts commit 1995db0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

LGTM Looks good to me

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mjkkirschner @QilongTang