Closed Totktonada closed 1 year ago
I would open a separate ticket in tarantool/small.
Filed #57, linked from here.
@CuriousGeorgiy said:
I don’t think tarantool/small#56 requires a second review, feel free to push it too, if you will.
I'm ok to proceed myself (I hope Aleksandr will not complain against such simple fix), but I would like to ensure that I understand correctly how to proceed.
tarantool's master
branch points to small's master
head. I should merge a patch to small's master
and promote the submodule in tarantool's master
.
tarantool's 2.10
branch points to small of two commits behind master
head (it lacks 02d3c23fd0d1e1743618850dc11378566b3804b1 and c1ac3eef79a7394fb52442a77b958b66d82b8f0b). Should I create tarantool-2.10
branch based on this commit and push the fix to it? Or promote tarantool's 2.10
to small's master
?
tarantool's 1.10
branch points to small's tarantool-1.10
head. Here everything is the same as with master
: push the fix to tarantool-1.10
and promote it in tarantool's 1.10
.
The question is what should I do with tarantool 2.10.
Let's consult @locker about this.
tarantool's
2.10
branch points to small of two commits behindmaster
head (it lacks 02d3c23 and c1ac3ee). Should I createtarantool-2.10
branch based on this commit and push the fix to it? Or promote tarantool's2.10
to small'smaster
?
No need to create a new branch for 2.10. The changes pushed in the commits you mentioned shouldn't affect Tarantool behavior anyhow. (Sanity check tools added by commit c1ac3eef79a7394fb52442a77b958b66d82b8f0b do nothing unless enabled in Tarantool.)
Cherry-picked to tarantool-1.10
.
Opened https://github.com/tarantool/tarantool/pull/8142 against tarantool's master
.
Opened https://github.com/tarantool/tarantool/pull/8143 against tarantool's 2.10
.
Opened https://github.com/tarantool/tarantool/pull/8144 against tarantool's 1.10
.
Part of https://github.com/tarantool/tarantool/issues/8110 Fixes #57