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

Support acc #511

Merged
merged 52 commits into from
Jun 24, 2024
Merged

Support acc #511

merged 52 commits into from
Jun 24, 2024

Conversation

YangSen-qn
Copy link
Contributor

[KODO-20386]
[KODO-20134]

@qiniu-prow qiniu-prow bot added the size/L label May 24, 2024
@YangSen-qn YangSen-qn force-pushed the master branch 2 times, most recently from 78cea59 to 5085d47 Compare May 24, 2024 06:45
# Conflicts:
#	library/src/main/java/com/qiniu/android/common/AutoZone.java
#	library/src/main/java/com/qiniu/android/common/Config.java
#	library/src/main/java/com/qiniu/android/common/Zone.java
#	library/src/main/java/com/qiniu/android/common/ZoneInfo.java
#	library/src/main/java/com/qiniu/android/http/ResponseInfo.java
#	library/src/main/java/com/qiniu/android/http/dns/DnsPrefetchTransaction.java
#	library/src/main/java/com/qiniu/android/http/dns/DnsPrefetcher.java
#	library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java
#	library/src/main/java/com/qiniu/android/storage/Configuration.java
@YangSen-qn YangSen-qn force-pushed the master branch 2 times, most recently from acbb173 to ca475ef Compare May 28, 2024 09:21
Copy link

qiniu-x bot commented May 31, 2024

[Git-flow] Hi @YangSen-qn, There are some suggestions for your information:


Rebase suggestions

  • Following commits seems generated via git merge

    Merge branch 'master' of YangSen-qn:qiniu/android-sdk into remove-region-ap-northeast-1

    Merge branch 'master' of YangSen-qn:qiniu/android-sdk into remove-region-ap-northeast-1

    Merge branch 'master' of YangSen-qn:qiniu/android-sdk into fixzone

    Merge branch 'develop' of YangSen-qn:qiniu/android-sdk into query-disk-cache

  • Following commits have duplicated messages

    Merge branch 'master' of YangSen-qn:qiniu/android-sdk into remove-region-ap-northeast-1

    Merge branch 'master' of YangSen-qn:qiniu/android-sdk into remove-region-ap-northeast-1

    change publish

    change publish

    change test case

    change test case

    change test case

    change test case

    change test case

Which seems insignificant, recommend to use git rebase command to reorganize your PR.

For other git-flow instructions, recommend refer to these examples.

If you have any questions about this comment, feel free to raise an issue here:

@bachue bachue merged commit 8a25c52 into qiniu:master Jun 24, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants