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

CORE-12165: resolve conflict on API version #1358

Conversation

dickon
Copy link
Contributor

@dickon dickon commented Nov 21, 2023

No description provided.

jennyang-r3 and others added 2 commits November 21, 2023 10:11
Added APIs for sending a transaction and receiving a transaction.
…E-12165/key-rotation

# Conflicts:
#	gradle.properties
@dickon dickon requested a review from a team as a code owner November 21, 2023 22:23
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@anien anien changed the base branch from release/os/5.2 to feature/CORE-12165/key-rotation November 21, 2023 22:25
@anien anien changed the base branch from feature/CORE-12165/key-rotation to release/os/5.2 November 21, 2023 22:25
@dickon dickon changed the base branch from release/os/5.2 to feature/CORE-12165/key-rotation November 21, 2023 22:29
@corda-jenkins-ci02
Copy link
Contributor

Scanning for breaking API changes introduced by this PR

Scan Succeeded

@corda-jenkins-ci02
Copy link
Contributor

corda-jenkins-ci02 bot commented Nov 21, 2023

Jenkins build for PR 1358 build 4

Build Successful:
Jar artifact version produced by this PR: 5.2.0.5-alpha-1700605783906

Copy link
Contributor

@anien anien left a comment

Choose a reason for hiding this comment

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

We hope this fixed github thinking we are bringing more commits into 5.2 than we actually are.

@anien anien merged commit f3f7469 into feature/CORE-12165/key-rotation Nov 21, 2023
8 checks passed
@anien anien deleted the dickon/feature-CORE-12165-merge-bump-version branch November 21, 2023 23:26
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