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.

Sign up for GitHub

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

Jump to bottom

version to v8.8.0 #512

Merged
merged 54 commits into from
Jun 24, 2024
Merged

version to v8.8.0 #512

merged 54 commits into from
Jun 24, 2024

Conversation

YangSen-qn
Copy link
Contributor

No description provided.

xwen-winnie and others added 30 commits December 10, 2021 15:15
@xwen-winnie
Merge pull request qiniu#475 from YangSen-qn/http3
1f364ad 
Http3
change uc query retry host order
ef8169f
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into remove-reg…
bc3f3dc 
…ion-ap-northeast-1
change test case
112ff06
change test case
8193846
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into remove-reg…
a052eb6 
…ion-ap-northeast-1
change mvn_push
027d9ba
update test token
47f87a6
change gradle.properties: config jvm
21fff24
change test case
5f060f7
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into fix-publish
4600249 
# Conflicts:
#	build.gradle
update mvn_push.gradle
13ba1e5
update test case
8608aa2
version to 8.6.0
5d73445
Merge branch 'fix-publish'
4ddce97
change publish
0f28b16
fix zone add createZonesInfo
8a0b360
update android gradle plugin
06c6ae7
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into fixzone
ae58017
change publish
99a8f69
add Cache - part 1
54c3003
auto zone support disk cache
64d0057
optimize upload run
b876c6b
change test case
0d746d3
change test token
d96a439
change test case
cccaef5
Merge branch 'develop' of YangSen-qn:qiniu/android-sdk into query-dis…
546892a 
…k-cache
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into query-disk…
21e3a11 
…-cache

# Conflicts:
#	library/src/androidTest/java/com/qiniu/android/TestConfig.java
optimize some code
71e44cf
auto zone build date
21f38d4
YangSen-qn added 24 commits November 6, 2023 11:24
cache timestamp unit to S
79a7e12
uc query add host: uc.qiniuapi.com
f48c2ca
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into uc-query-a…
e49840e 
…dd-host
change http scheme logic
fe832a3
change setHostScheme
16d92e0
version to 8.7.0
5f22804
Merge branch 'master' of YangSen-qn:qiniu/android-sdk
4132537
Merge branch 'master' of YangSen-qn:qiniu/android-sdk
190d736
add some doc
e1ed20d
add some doc
3340c3e
change some doc
1e41eed
hidden some doc
b582e31
remove useless code
7b27280
change javadoc
b091623
change doc
aa679cc
optimize some code
03355a3
Merge branch 'multi-region'
5febea7
delete useless code
1a697ee
feature: support acc
0b32ed1
Merge branch 'master' of YangSen-qn:qiniu/android-sdk
96e5b12 
# 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
optimize some code
8557029
change dns test
47179ca
version to v8.8.0
256b96a
Merge
74127ef
@qiniu-x qiniu-x
Copy link

qiniu-x bot commented Jun 24, 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 test case

    change test case

    change test case

    change test case

    change test case

    change publish

    change publish

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:

@qiniu-prow qiniu-prow bot added the size/M label Jun 24, 2024
@bachue bachue merged commit 0b6ca58 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
Reviewers

@bachue bachue bachue approved these changes

Assignees
No one assigned
Labels
size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@YangSen-qn @bachue @xwen-winnie