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

Merge develop into sep-6 #1107

Merged
merged 8 commits into from
Sep 13, 2023
Merged

Conversation

philipliu
Copy link
Contributor

No description provided.

lijamie98 and others added 8 commits August 31, 2023 11:36
<!-- If you're making a doc PR or something tiny where the below is
irrelevant, delete this
template and use a short description, but in your description aim to
include both what the
change is, and why it is being made, with enough context for anyone to
understand. -->

### Description

<!-- Short statement about what is changing. -->

### Context

<!-- Why this change is being made. Include any context required to
understand the why. -->

### Testing
<!-- How was this change tested? -->
<!-- Default to `./gradlew test` but if there are other steps required
to test, include them here. -->
`./gradlew test`

### Known limitations

<!-- Any known limitations or edge cases. If no known limitations, put
NA here.-->
<!-- If you're making a doc PR or something tiny where the below is
irrelevant, delete this
template and use a short description, but in your description aim to
include both what the
change is, and why it is being made, with enough context for anyone to
understand. -->

### Description

<!-- Short statement about what is changing. -->

### Context

<!-- Why this change is being made. Include any context required to
understand the why. -->

### Testing
<!-- How was this change tested? -->
<!-- Default to `./gradlew test` but if there are other steps required
to test, include them here. -->
`./gradlew test`

### Known limitations

<!-- Any known limitations or edge cases. If no known limitations, put
NA here.-->
### Description

Add @param to the status function parameter to fix the Spring database error.
@philipliu philipliu changed the base branch from develop to sep-6 September 13, 2023 14:41
@philipliu philipliu changed the title Merge develop into sep-6 Merge develop into sep-6 Sep 13, 2023
@philipliu philipliu marked this pull request as ready for review September 13, 2023 15:00
Copy link
Contributor

@JiahuiWho JiahuiWho left a comment

Choose a reason for hiding this comment

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

lgtm

@philipliu philipliu merged commit 067a41f into stellar:sep-6 Sep 13, 2023
@philipliu philipliu deleted the sep-6-09-13-merge branch September 29, 2023 15:58
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.

5 participants