-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
[stable10] Backport all objectstore related changes #31050
[stable10] Backport all objectstore related changes #31050
Conversation
Codecov Report
@@ Coverage Diff @@
## stable10 #31050 +/- ##
==============================================
+ Coverage 62.26% 62.34% +0.07%
- Complexity 18330 18550 +220
==============================================
Files 1205 1210 +5
Lines 72219 72607 +388
Branches 1274 1272 -2
==============================================
+ Hits 44970 45266 +296
- Misses 26871 26962 +91
- Partials 378 379 +1
Continue to review full report at Codecov.
|
a wild conflict appears... |
c08a95e
to
4bf34ad
Compare
4bf34ad
to
39dee0c
Compare
39dee0c
to
61b2c5b
Compare
61272ae
to
a4b7ee6
Compare
Added a commit to remove duplicate code that got left behind in |
I think something is still wrong with:
That |
Added commit |
d18dcbc
to
487eba7
Compare
Travis has some stupid travis-ci/push thing that does not work - whatever that is about??? |
487eba7
to
94c18a3
Compare
Good that this is finally merged. In future we should try very hard not to have big changes like this that wait a long time until someone decides they should be backported, and other dependent changes pile up behind and... @DeepDiver1975 re: commits - I know all about rebasing and squashing "fix" commits into the original commits where they belong. For those last 2 commits, it was late at night here and I wanted to just prove the fixes. Then I intended to try and find the commits (among the other 49) where the conflict resolution had gone wrong in the past and apply the fixes to those commits. That is a bit tedious (looking at the content of each commit in the history to find ones that went wrong), so I left it for after sleep. In the meantime the PR has been merged. So it is too late now - those last 2 commits are on the stable10 branch. |
Targetting 10.0.9