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

feature/BB 383/skipZeroByteToDMF #2386

Merged
merged 2 commits into from
Apr 13, 2023

Conversation

alexanderchan-scality
Copy link
Contributor

  • Revert "BB-381: do not send empty objects to tape for now"
  • BB-383: skip transitioning of 0 bytes object to DMF locations

@bert-e
Copy link
Contributor

bert-e commented Apr 13, 2023

Hello alexanderchan-scality,

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 Apr 13, 2023

Incorrect fix version

The Fix Version/s in issue BB-383 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 8.4.26

  • 8.5.5

  • 8.6.11

Please check the Fix Version/s of BB-383, or the target
branch of this pull request.

@alexanderchan-scality alexanderchan-scality force-pushed the feature/BB-383/skipZeroByteToDMF branch from 56018b7 to 7858a58 Compare April 13, 2023 18:42
@bert-e
Copy link
Contributor

bert-e commented Apr 13, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/feature/BB-383/skipZeroByteToDMF with contents from w/8.5/feature/BB-383/skipZeroByteToDMF
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/feature/BB-383/skipZeroByteToDMF origin/development/8.6
 $ git merge origin/w/8.5/feature/BB-383/skipZeroByteToDMF
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/feature/BB-383/skipZeroByteToDMF

@bert-e
Copy link
Contributor

bert-e commented Apr 13, 2023

Waiting for approval

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

  • the author

  • 2 peers

@alexanderchan-scality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 13, 2023

Build failed

The build for commit did not succeed in branch w/8.5/feature/BB-383/skipZeroByteToDMF.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 13, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/7.70

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 13, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70

Please check the status of the associated issue BB-383.

Goodbye alexanderchan-scality.

@bert-e bert-e merged commit 7858a58 into development/8.4 Apr 13, 2023
@bert-e bert-e deleted the feature/BB-383/skipZeroByteToDMF branch April 13, 2023 21:56
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.

4 participants