[GitHub] [kafka] badaiaqrandista opened a new pull request, #12820: [DO NOT MERGE] 3.2 sync upstream 4 nov 2022

[GitBox <gi...@apache.org>]

badaiaqrandista opened a new pull request, #12820:
URL: https://github.com/apache/kafka/pull/12820

   NOTE: This PR should be merged using CLI to preserve commit history
   
   Based on https://confluentinc.atlassian.net/wiki/spaces/KAFKA/pages/776700227/ce-kafka+merge+process#Kafka.1
   
   Check remotes
   
   ```
   badai /Users/badai/Documents/Sources/confluentinc/kafka
   → git remote -v
   apache-kafka	git@github.com:apache/kafka.git (fetch)
   apache-kafka	no_push (push)
   origin	git@github.com:confluentinc/kafka (fetch)
   origin	git@github.com:confluentinc/kafka (push)
   ```
   
   Steps followed
   
   ```
   git remote update
   git checkout master
   git pull
   
   git checkout -b  3.2-sync-upstream-4-nov-2022 origin/3.2
   
   # Merge AK changes in from apache/kafka:3.2
   → git merge apache-kafka/3.2
   Auto-merging gradle.properties
   CONFLICT (content): Merge conflict in gradle.properties
   Auto-merging streams/quickstart/java/pom.xml
   CONFLICT (content): Merge conflict in streams/quickstart/java/pom.xml
   Auto-merging streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
   CONFLICT (content): Merge conflict in streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
   Auto-merging streams/quickstart/pom.xml
   CONFLICT (content): Merge conflict in streams/quickstart/pom.xml
   Auto-merging tests/kafkatest/__init__.py
   CONFLICT (content): Merge conflict in tests/kafkatest/__init__.py
   Auto-merging tests/kafkatest/version.py
   CONFLICT (content): Merge conflict in tests/kafkatest/version.py
   Recorded preimage for 'gradle.properties'
   Recorded preimage for 'streams/quickstart/java/pom.xml'
   Recorded preimage for 'streams/quickstart/java/src/main/resources/archetype-resources/pom.xml'
   Recorded preimage for 'streams/quickstart/pom.xml'
   Recorded preimage for 'tests/kafkatest/__init__.py'
   Recorded preimage for 'tests/kafkatest/version.py'
   Automatic merge failed; fix conflicts and then commit the result.
   
   # Fixed the conflicts and commit
   → git status
   On branch 3.2-sync-upstream-4-nov-2022
   Changes to be committed:
     (use "git restore --staged <file>..." to unstage)
   	modified:   clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinator.java
   	modified:   clients/src/test/java/org/apache/kafka/clients/consumer/internals/AbstractCoordinatorTest.java
   	modified:   docs/js/templateData.js
   	modified:   kafka-merge-pr.py
   	modified:   tests/kafkatest/version.py
   
   → git commit -m "Merged remote trancking branch into 3.2-sync-upstream-4-nov-2022"
   [3.2-sync-upstream-4-nov-2022 110bc01462] Merged remote trancking branch into 3.2-sync-upstream-4-nov-2022
    5 files changed, 71 insertions(+), 3 deletions(-)
   ```
   
   Steps remaining
   
   ```
   git checkout 3.2
   git pull
   git merge origin/3.2-sync-upstream-4-nov-2022
   git push origin 3.2
   ```
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [kafka] badaiaqrandista closed pull request #12820: [DO NOT MERGE] 3.2 sync upstream 4 nov 2022

[GitBox <gi...@apache.org>]

badaiaqrandista closed pull request #12820: [DO NOT MERGE] 3.2 sync upstream 4 nov 2022
URL: https://github.com/apache/kafka/pull/12820


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: jira-unsubscribe@kafka.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org