Skip to content

Conversation

@slievrly
Copy link
Member

merge into master should use per commit merge

@codecov-io
Copy link

codecov-io commented May 25, 2019

Codecov Report

Merging #1107 into master will decrease coverage by 2.75%.
The diff coverage is 66.27%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1107      +/-   ##
============================================
- Coverage     41.83%   39.08%   -2.76%     
+ Complexity     1361     1119     -242     
============================================
  Files           243      221      -22     
  Lines         10111     8833    -1278     
  Branches       1319     1130     -189     
============================================
- Hits           4230     3452     -778     
+ Misses         5334     4940     -394     
+ Partials        547      441     -106
Impacted Files Coverage Δ Complexity Δ
.../src/main/java/io/seata/rm/tcc/TwoPhaseResult.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...java/io/seata/server/session/SessionCondition.java 66.66% <ø> (+19.99%) 2 <0> (-5) ⬇️
...seata/core/exception/AbstractExceptionHandler.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...a/io/seata/core/rpc/netty/AbstractRpcRemoting.java 9.32% <ø> (ø) 4 <0> (ø) ⬇️
.../io/seata/core/rpc/netty/NettyPoolableFactory.java 10.34% <ø> (ø) 2 <0> (ø) ⬇️
...ain/java/io/seata/tm/TransactionManagerHolder.java 69.23% <ø> (ø) 3 <0> (ø) ⬇️
...ava/io/seata/core/constants/ConfigurationKeys.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...ommon/src/main/java/io/seata/common/Constants.java 0% <ø> (-50%) 0 <0> (-1)
...rm/tcc/remoting/parser/LocalTCCRemotingParser.java 51.61% <ø> (ø) 4 <0> (ø) ⬇️
...in/java/io/seata/rm/datasource/StatementProxy.java 25% <ø> (ø) 3 <0> (ø) ⬇️
... and 43 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7ca3332...a8d46df. Read the comment docs.

Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

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

LGTM

@zhangthen
Copy link
Contributor

zhangthen commented May 26, 2019

You can revert the master, and push master -f ,then merge 0.6.0 to master again with the origin commits.
Or you close the PR, and I do it.

@slievrly
Copy link
Member Author

You can revert the master, and push master -f ,then merge 0.6.0 to master again with the origin commits.
Or you close the PR, and I do it.

after revert the master,why execute push -f master?

@slievrly slievrly merged commit dc088cb into master May 27, 2019
@slievrly slievrly mentioned this pull request May 27, 2019
@slievrly slievrly deleted the revert-1106-0.6.0 branch June 6, 2019 10:10
@wangliang181230 wangliang181230 added this to the 0.6.* milestone Aug 9, 2021
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