Skip to content
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

improvement/ZENKO-4446-update-s3utils #1770

Open
wants to merge 23 commits into
base: development/2.6
Choose a base branch
from

Conversation

XinLi0207
Copy link

this PR will bump s3utils to include storage consumption metrics feature in Zenko post releasing s3utils

@bert-e
Copy link
Contributor

bert-e commented Dec 20, 2022

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.

@bert-e
Copy link
Contributor

bert-e commented Dec 20, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@bert-e
Copy link
Contributor

bert-e commented Jan 3, 2023

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.

@bert-e
Copy link
Contributor

bert-e commented Jan 3, 2023

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

@XinLi0207 XinLi0207 force-pushed the improvement/ZENKO-4446-update-s3utils branch from 2efcec3 to 675c8ec Compare January 3, 2023 17:12
@bert-e
Copy link
Contributor

bert-e commented Jan 3, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@XinLi0207 XinLi0207 force-pushed the improvement/ZENKO-4446-update-s3utils branch from 35397f9 to 654bf1e Compare January 4, 2023 13:39
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.

2 participants