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

bugfix: ZENKO-1522 helper ObjectMD.isMultipartUpload() #686

Merged
merged 1 commit into from
Feb 22, 2019

Conversation

jonathan-gramain
Copy link
Contributor

Created this helper to check what kind of CRR to execute depending on
if the object is a MPU or not.

Created this helper to check what kind of CRR to execute depending on
if the object is a MPU or not.
@bert-e
Copy link
Contributor

bert-e commented Feb 22, 2019

Hello jonathan-gramain,

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 Feb 22, 2019

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/bugfix/ZENKO-1522-isMultipartUploadHelper with contents from bugfix/ZENKO-1522-isMultipartUploadHelper
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/ZENKO-1522-isMultipartUploadHelper origin/development/8.1
 $ git merge origin/bugfix/ZENKO-1522-isMultipartUploadHelper
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ZENKO-1522-isMultipartUploadHelper

@bert-e
Copy link
Contributor

bert-e commented Feb 22, 2019

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4
  • development/7.5
  • stabilization/7.4.3

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Feb 22, 2019

Waiting for approval

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

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@jonathan-gramain
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Feb 22, 2019

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.0

  • ✔️ development/8.1

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4
  • development/7.5
  • stabilization/7.4.3

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 Feb 22, 2019

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

  • ✔️ development/8.0

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • development/7.4
  • development/7.5
  • stabilization/7.4.3

Please check the status of the associated issue ZENKO-1522.

Goodbye jonathan-gramain.

@bert-e bert-e merged commit 9fe0ba5 into development/8.0 Feb 22, 2019
@jonathan-gramain jonathan-gramain deleted the bugfix/ZENKO-1522-isMultipartUploadHelper branch February 22, 2019 19:09
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.

6 participants