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: S3C-2899 pass vFormat to listing params #1016

Merged
merged 2 commits into from
May 19, 2020

Conversation

jonathan-gramain
Copy link
Contributor

Add an optional "vFormat" param to constructors of listing algo
classes, to specify the versioning key format used by the bucket to
list. Currently only v0 is supported.

Code cleanups done in the listing classes to prepare support for the
v1 format.

This to benefit from the longer line length allowed (80 -> 120)
Add an optional "vFormat" param to constructors of listing algo
classes, to specify the versioning key format used by the bucket to
list. Currently only v0 is supported.

Code cleanups done in the listing classes to prepare support for the
v1 format.
@bert-e
Copy link
Contributor

bert-e commented May 16, 2020

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 May 16, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/bugfix/S3C-2899-passVformatToListingParams with contents from w/7.7/bugfix/S3C-2899-passVformatToListingParams
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/S3C-2899-passVformatToListingParams origin/development/8.1
 $ git merge origin/w/7.7/bugfix/S3C-2899-passVformatToListingParams
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/S3C-2899-passVformatToListingParams

Copy link
Contributor

@dora-korpar dora-korpar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jonathan-gramain
Copy link
Contributor Author

@bert-e approve

// non-PHD master version or a version whose master is a PHD version
this.prvKey = undefined;
this.prvPHDKey = undefined;
}

/**
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This JSDoc was not meant to be removed, I will re-introduce it in the next PR.

@jonathan-gramain
Copy link
Contributor Author

bert-e?

@jonathan-gramain
Copy link
Contributor Author

bert-eeeee

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.4.6

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

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/7.4

  • ✔️ development/7.7

  • ✔️ development/8.1

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.4.6

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 May 19, 2020

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

  • ✔️ development/7.4

  • ✔️ development/7.7

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • stabilization/7.4.6

Please check the status of the associated issue S3C-2899.

Goodbye jonathan-gramain.

@bert-e bert-e merged commit cf4d908 into development/7.4 May 19, 2020
@bert-e bert-e deleted the bugfix/S3C-2899-passVformatToListingParams branch May 19, 2020 17:13
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