Zenko
Zenko copied to clipboard
improvement/ZENKO-4446-update-s3utils
this PR will bump s3utils to include storage consumption metrics feature in Zenko post releasing s3utils
Hello xinliscality,
My role is to assist you with the merge of this
pull request. Please type @bert-e help
to get information
on this process, or consult the user documentation.
Status report is not available.
Waiting for approval
The following approvals are needed before I can proceed with the merge:
-
the author
-
2 peers
Incorrect fix version
The Fix Version/s
in issue ZENKO-4446 contains:
-
2.5.11
-
2.6.3
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
-
2.6.3
Please check the Fix Version/s
of ZENKO-4446, or the target
branch of this pull request.
Conflict
There is a conflict between your branch improvement/ZENKO-4446-update-s3utils
and the
destination branch development/2.6
.
Please resolve the conflict on the feature branch (improvement/ZENKO-4446-update-s3utils
).
git fetch && \
git checkout origin/improvement/ZENKO-4446-update-s3utils && \
git merge origin/development/2.6
Resolve merge conflicts and commit
git push origin HEAD:improvement/ZENKO-4446-update-s3utils
Waiting for approval
The following approvals are needed before I can proceed with the merge:
-
the author
-
2 peers