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 from master to beta #1893

Merged
merged 10 commits into from
Oct 4, 2024
Merged

Merge from master to beta #1893

merged 10 commits into from
Oct 4, 2024

Conversation

ramya-stripe
Copy link
Contributor

@ramya-stripe ramya-stripe commented Oct 3, 2024

There have been more changes in the master branch since the last time we merged from it to beta. Doing on last merge from master before this week's beta releases

@ramya-stripe ramya-stripe changed the title Ramya/merge beta Merge from master to beta Oct 3, 2024
Copy link
Contributor

@jar-stripe jar-stripe left a comment

Choose a reason for hiding this comment

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

LGTM

@ramya-stripe ramya-stripe merged commit 0ea903a into beta Oct 4, 2024
12 checks passed
@ramya-stripe ramya-stripe deleted the ramya/merge-beta branch October 4, 2024 00:04
@@ -394,7 +394,7 @@ protected static String normalizeClientId(String clientId) {
}

protected static String normalizeStripeVersion(String stripeVersion) {
// null stripeVersions are considered "valid" and use Stripe.stripeVersion
// null stripeVersions are considered "valid" and use Stripe.apiVersion
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't it be Stripe.stripeVersion?

public static volatile String stripeVersion = API_VERSION;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right. I assumed what was in master to be the source of truth - didnt check the actual property name

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.

4 participants