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

[Service Bus] Merge feature/service-bus-track-2 into master #7312

Merged
merged 26 commits into from
Feb 12, 2020

Conversation

HarshaNalluru
Copy link
Member

@HarshaNalluru HarshaNalluru commented Feb 10, 2020

This PR is to merge feature/service-bus-track-2 branch into master.

@HarshaNalluru HarshaNalluru changed the title Harshan/sb/merge to master Merge feature/service-bus-track-2 into master Feb 10, 2020
@HarshaNalluru
Copy link
Member Author

/azp run js - servicebus - tests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@HarshaNalluru
Copy link
Member Author

HarshaNalluru commented Feb 10, 2020

Live tests - Build ✔ green

@HarshaNalluru HarshaNalluru changed the title Merge feature/service-bus-track-2 into master [Service Bus] Merge feature/service-bus-track-2 into master Feb 10, 2020
@HarshaNalluru HarshaNalluru added Client This issue points to a problem in the data-plane of the library. Service Bus labels Feb 10, 2020
@HarshaNalluru HarshaNalluru marked this pull request as ready for review February 10, 2020 19:59
Copy link
Contributor

@ramya-rao-a ramya-rao-a left a comment

Choose a reason for hiding this comment

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

Left a few comments, please take a look along with resolving merge conflicts

@ramya-rao-a
Copy link
Contributor

@HarshaNalluru After addressing the review comments and resolving the merge conflicts, please trigger the live tests

@HarshaNalluru
Copy link
Member Author

/azp run js - servicebus - tests

@azure-pipelines
Copy link

Pull request contains merge conflicts.

@HarshaNalluru
Copy link
Member Author

/azp run js - servicebus - tests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@chradek chradek left a comment

Choose a reason for hiding this comment

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

Just have one comment about deps.

@@ -90,11 +88,12 @@
"long": "^4.0.0",
"process": "^0.11.10",
"rhea": "^1.0.18",
"rhea-promise": "^0.1.15",
"rhea-promise": "^1.0.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

This and rhea shouldn't be needed anymore. core-amqp pulls them in.

Copy link
Member Author

Choose a reason for hiding this comment

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

removed rhea and rhea-promise.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, I didn't realize rhea-promise was being used directly. It looks like only rhea can be safely removed.

Copy link
Member Author

Choose a reason for hiding this comment

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

added "rhea-promise" back

@ramya-rao-a
Copy link
Contributor

Screen Shot 2020-02-11 at 2 49 45 PM

@HarshaNalluru
Copy link
Member Author

/azp run js - servicebus - tests

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@chradek chradek left a comment

Choose a reason for hiding this comment

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

Assuming the live tests pass, 🚢🇮🇹

@HarshaNalluru HarshaNalluru dismissed ramya-rao-a’s stale review February 12, 2020 18:46

Dismissing since approved b y Chris

@HarshaNalluru HarshaNalluru merged commit 7669ba7 into Azure:master Feb 12, 2020
@HarshaNalluru HarshaNalluru deleted the harshan/sb/merge-to-master branch March 22, 2020 00:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Client This issue points to a problem in the data-plane of the library. Service Bus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants