MINOR: Fix bump master to 7.6.0-0#901
Merged
Merged
Conversation
Purshotam Chauhan (emissionnebula)
marked this pull request as ready for review
June 12, 2023 12:47
Member
|
Thanks Sneha Wadhwa (@wadhwa1). I have checked the 7.x.x related changes and they look similar to the previous commit #870. I have marked this PR as ready to review and retriggered the build. |
Purshotam Chauhan (emissionnebula)
approved these changes
Jun 13, 2023
Purshotam Chauhan (emissionnebula)
left a comment
Purshotam Chauhan (emissionnebula)
left a comment
Member
There was a problem hiding this comment.
The build failure is unrelated. Test failures are flaky.
Honshu Priyadarshi (honshu)
added a commit
that referenced
this pull request
Aug 27, 2023
Fixed the conflict causing the jenkins job failure from AK-> CCS. Below are the PR which caused the conflict. In AK apache#14286 apache#13676 In CCS #901 For #901 and apache#14286 conflict I have kept the versioning changes of CCS in files settings.gradle streams/quickstart/java/pom.xml streams/quickstart/java/src/main/resources/archetype-resources/pom.xml streams/quickstart/pom.xml tests/kafkatest/__init__.py For apache#13676 i don't an actual conflict except few function added in AK. so i brought changes from AK
Honshu Priyadarshi (honshu)
added a commit
that referenced
this pull request
Aug 27, 2023
Fixed the conflict causing the jenkins job failure from AK-> CCS. Below are the PR which caused the conflict. In AK apache#14286 apache#13676 In CCS #901 For #901 and apache#14286 conflict I have kept the versioning changes of CCS in files gradle.properties settings.gradle streams/quickstart/java/pom.xml streams/quickstart/java/src/main/resources/archetype-resources/pom.xml streams/quickstart/pom.xml tests/kafkatest/__init__.py
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When AK version bump to 3.6 was merged in, the 3.6 bumps were merged in correctly, but 7.6.0 CCS version bump was not applied. This commit applies 7.6.0 version bump for ccs kafka in master branch