Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Resolve code conflicts #2

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
Merged
GoodBoyCoder merged 75 commits into from
Apr 8, 2023
Merged

Resolve code conflicts #2

GoodBoyCoder merged 75 commits into from
Apr 8, 2023

Conversation

@funky-eyes
Copy link

@funky-eyes funky-eyes commented Apr 8, 2023

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

yuruixin and others added 30 commits January 8, 2023 18:28
@yuruixin
optimize: print Stack Trace in EnhancedServiceLoader.loadFile#catch (a…
7291b41 
…pache#5237)
@renliangyu857
optimize: Throwable#getCause once more (apache#5208)
0a09db2
@AlbumenJ
bugfix: seata-core dependency transitive conflict in seata-dubbo (apa…
fc29936 
…che#5203)
@xingfudeshi
bugfix: fix the inconsistent configuration item names related to Load…
d19cfee 
…Balance (apache#5233)
@Bughue
optimize: Only AT mode try to get channel with other app (apache#5153)
a84bbcc
@Bughue
security: fix some security vulnerabilities (apache#5172)
24ccd99
@pengten
optimize: unlock branch synchronously. (apache#5177)
6a7e1bb
@HEIBAIJIE
bugfix: fix the incomplete dependency of distribution module (apache#…
fda8060 
…5261)
@JavaLionLi
optimize: kryo 5.4.0 compatibility with jdk17 (apache#5243)
63f685e
@wangliang181230
bugfix: fix getConfig throw ClassCastException when use JDK proxy (…
72347f2 
…apache#5239)
@slievrly
optimize: optimize workflow for 2.x (apache#5268)
4527a41
@sunrui1225
feature: optimize TCC structure, supporting API access (apache#5165)
c7fba75
@Bughue
optimize : reorganize the usage of task session manager(add/remove/fi…
4b724e2 
…nd/update) (apache#4858)
@GoodBoyCoder
optimize: Fix the problem that protobuf compilation fails due to too …
40a90a6 
…long command line (apache#5273)
@Bughue
optimize : reorganize the usage of Sessionmanager and SessionLifecycl…
25999c3 
…eListener (apache#4881)
@renliangyu857
bugfix: the console has queried the released lock (apache#5277)
e9ccad2
@funky-eyes
bugfix: parallel request handle throw IndexOutOfBoundsException
913ec96
@funky-eyes
bugfix: parallel request handle throw IndexOutOfBoundsException (apac…
5ef89a0 
…he#5282)
@Bughue
optimize: clean multi-sessionmanager-instance pattern (apache#5278)
fb0bc76
@isharpever
bugfix: After 1.6.0, auto-increment of pgsql/oracle pk columns are no…
0112719 
… longer supported (apache#5294)
@ZhangShiYeChina
bugfix: don't remove GlobalSession when retry rollback or retry commi…
5eb7c18 
…t timeout (apache#5298)
@mxsm
optimize: Remove startup script the -Xmn configuration (apache#5302)
12eabb1
@Bughue
optimize: optimize logs when global commit/rollback catch an exception (
3b5ec35 
apache#4880)
@liuqiufeng
test: add unit test[FileLoader, ObjectHolder, StringUtils] (apache#5308)
42693c6
@slievrly
bugfix: remove RollbackRetryTimeout sessions during in file storage r…
33d777e 
…ecover (apache#5304)
@funky-eyes
bugfix: that keywords don't add escaped characters (apache#5310)
207dda4
@slievrly
bugfix: fix G1 jvm parameter in jdk8 (apache#5318)
5aa0e81
@liuqiufeng
test: add unit test[ArrayUtils,ConfigTools,MapUtil] (apache#5309)
08f96f5
@l81893521
optimize: optimize EnhancedServiceLoader log (apache#5322)
1944640
@renliangyu857
optimize: add time info in global transaction timeout log for 2.x bra…
2302178 
…nch (apache#5326)
slievrly and others added 29 commits February 22, 2023 00:44
@slievrly
optimize: reconstruct the RPC integration module (apache#5354)
884f3b1
@slievrly
test: fix multi spring version test failed (apache#5383)
1ab95d7
@wangliang181230
optimize: unified project version (apache#5384)
d1c4b78
@liuqiufeng
test: add unit test for config module (apache#5391)
a7685fb
@slievrly
bugfix: fix transaction timeout on client side not execute hook and f…
5aa6c29 
…ailureHandler (apache#5373)
@Bughue
bugfix : check if table meta cache should be refreshed in AT mode (ap…
86c1c5d 
…ache#5395)
@Bughue
feature : add TC exception log appender metric (apache#5396)
e69627d
@wangliang181230
optimize: publish images based on java 8/17 and support maven-3.9.0 (a…
168d3da 
…pache#5419)
@slievrly
optimize: optimize contact information (apache#5430)
faeb393 
Signed-off-by: slievrly <[email protected]>
@funky-eyes
bugfix: FileTransactionStoreManagerTest NPE (apache#5428)
19d2236
@slievrly
optimize: optimize github workflow (apache#5431)
5f4f326
@sunrui1225
bugfix: the GlobalTransactional annotation npe issue. (apache#5426)
e5169bb
@PeppaO
bugfix: oracle xa mode cannnot be used By same database (apache#5449)
d275cd1
@jsbxyyx
doc: update console-fe readme (apache#5442)
a05502a
@tuwenlin
bugfix: global session is always begin in saga mode for 2.x (apache#5464
7ae9c0d 
)
@slievrly
optimize: exclude some incompatible license (apache#5461)
2a6759b
@l81893521
optimize: optimize code style properties (apache#5438)
22f1129
@slievrly
optimize: optimize transaction log on client side (apache#5471)
bde18f5
@pengten
bugfix: fix using @GlobalTransactional in provider ShouldNeverHappenE…
b36a669 
…xception thrown (apache#5462)
@slievrly
optimize: refactor ColumnUtils and EscapeHandler (apache#5456)
faea6fb
@slievrly
bugfix: fix finished transaction swallows exception when committing (a…
43603f6 
…pache#5478)
@funky-eyes
optimize: thread scheduling and code (apache#4907)
3e2c348
@slievrly
optimize: optimize server log output (apache#5485)
d325615
@funky-eyes
feature: support two-stage concurrent notification execution (apache#…
f7eba5c 
…5118)
@slievrly
docs: add security docs (apache#5489)
ae125eb 
Signed-off-by: slievrly <[email protected]>
@slievrly
bugfix: fix method name not print in logs (apache#5490)
cff37de
@funky-eyes
optimize: mark the lockholder of branchsession as final (apache#5487)
7d6d602
@funky-eyes
Resolve code conflicts
c433d8b
@funky-eyes
Merge branch '2.x' of github.com:seata/seata into feature_support_sql…
8e93996 
…server
@GoodBoyCoder GoodBoyCoder merged commit 1fbc29a into GoodBoyCoder:feature_support_sqlserver Apr 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.