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

Adapt stream Java tests to client 0.12.0 snapshot (backport #8880) #8882

Merged
merged 2 commits into from
Jul 17, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 17, 2023

This is an automatic backport of pull request #8880 done by Mergify.
Cherry-pick of c594c77 has failed:

On branch mergify/bp/v3.12.x/pr-8880
Your branch is up to date with 'origin/v3.12.x'.

You are currently cherry-picking commit c594c77049.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/FailureTest.java
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/StreamTest.java
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/src/test/java/com/rabbitmq/stream/TestUtils.java
	modified:   deps/rabbitmq_stream_management/test/http_SUITE_data/src/test/java/com/rabbitmq/stream/HttpTest.java
	modified:   deps/rabbitmq_stream_management/test/http_SUITE_data/src/test/java/com/rabbitmq/stream/TestUtils.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml
	both modified:   deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

After changes for
rabbitmq/rabbitmq-stream-java-client#333.

(cherry picked from commit c594c77)

# Conflicts:
#	deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml
#	deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml
@acogoluegnes acogoluegnes merged commit 0d7ee84 into v3.12.x Jul 17, 2023
14 checks passed
@acogoluegnes acogoluegnes deleted the mergify/bp/v3.12.x/pr-8880 branch July 17, 2023 09:38
acogoluegnes added a commit that referenced this pull request Jul 17, 2023
Adapt stream Java tests to client 0.12.0 snapshot (backport #8880) (backport #8882)
acogoluegnes added a commit that referenced this pull request Jul 17, 2023
Adapt stream Java tests to client 0.12.0 snapshot (backport #8880) (backport #8882) (backport #8883)
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.

1 participant