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

Reconcile Master & Current Release: Revert Preconfigured NSG Changes #3058

Merged
merged 3 commits into from
Jul 24, 2023

Conversation

bennerv
Copy link
Collaborator

@bennerv bennerv commented Jul 24, 2023

Adds changes released to prod in release branch release/sprint239_hotfix into master to maintain some level of synchronization.

Right now if you try deploying master + changes to any environment, it breaks if the AFEC feature flag is registered. We should maintain consistency between what's released / reverted and what current master looks like.

Changes should be cherry-picked from master into release branches, not the other way around.

@bennerv bennerv changed the title Revert Preconfigured NSG Changes Reconcile Master & Current Release: Revert Preconfigured NSG Changes Jul 24, 2023
Copy link
Collaborator

@cadenmarchese cadenmarchese left a comment

Choose a reason for hiding this comment

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

Thanks for fixing! Good to merge on green CI.

@bennerv
Copy link
Collaborator Author

bennerv commented Jul 24, 2023

cc @nwnt - feel free to include this PR revert in your NSG PR once you have a fix up.

@bennerv bennerv merged commit 6bc0f37 into Azure:master Jul 24, 2023
18 checks passed
@nwnt
Copy link
Contributor

nwnt commented Jul 24, 2023

This will be fixed in #3057

@nwnt nwnt mentioned this pull request Jul 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants