Skip to content

Merge 2.0.0-kinesis-event-streaming branch with master #784

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

Merged
merged 2 commits into from
Oct 26, 2018

Conversation

varunnvs92
Copy link
Contributor

No description provided.

@varunnvs92 varunnvs92 changed the title Kinesis master merge Merge 2.0.0-kinesis-event-streaming branch with master Oct 26, 2018
@varunnvs92 varunnvs92 requested a review from shorea October 26, 2018 21:49
@varunnvs92 varunnvs92 force-pushed the kinesis-master-merge branch from 269c271 to ef7e837 Compare October 26, 2018 22:03
@@ -277,6 +277,7 @@ public void close() {
Builder protocol(Protocol protocol);

/**
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be removed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will do

@varunnvs92
Copy link
Contributor Author

Updated based on internal/external comments

@varunnvs92 varunnvs92 force-pushed the kinesis-master-merge branch from 02f1a6c to f1cc1a8 Compare October 26, 2018 22:33
@varunnvs92 varunnvs92 merged commit 5da5d8f into master Oct 26, 2018
@varunnvs92 varunnvs92 deleted the kinesis-master-merge branch October 30, 2018 19:57
aws-sdk-java-automation added a commit that referenced this pull request Apr 6, 2020
…46919908

Pull request: release <- staging/a26a01ba-b72f-4b07-b954-51c646919908
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