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.

Sign up for GitHub

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

Jump to bottom

bugfix: S3C-2899 implement v1 format for DelimiterVersions listing #1031

Merged
merged 1 commit into from
May 21, 2020
Merged

bugfix: S3C-2899 implement v1 format for DelimiterVersions listing #1031

merged 1 commit into from
May 21, 2020

Conversation

jonathan-gramain
Copy link
Contributor

@jonathan-gramain jonathan-gramain commented May 19, 2020 •
edited
Loading

Implement the v1 versioning key format for DelimiterVersions listing
method, in addition to v0.

Enhance existing unit tests to check the result of getMDParams()

Requires merging PR #1018 first.

@bert-e
Copy link
Contributor

bert-e commented May 19, 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.

This was referenced May 19, 2020
Closed
Closed
@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.

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Waiting for approval

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

  • the author

  • 2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

@jonathan-gramain jonathan-gramain force-pushed the bugfix/S3C-2899-vformatV1delimiterVersions branch from d81a551 to 1bd8038 Compare May 19, 2020 23:14
@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

History mismatch

Merge commit #d81a551b958824c06c4859874d40d6504f984d30 on the integration branch
w/7.7/bugfix/S3C-2899-vformatV1delimiterVersions is merging a branch which is neither the current
branch bugfix/S3C-2899-vformatV1delimiterVersions nor the development branch
development/7.7.

It is likely due to a rebase of the branch bugfix/S3C-2899-vformatV1delimiterVersions and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@jonathan-gramain jonathan-gramain force-pushed the bugfix/S3C-2899-vformatV1delimiterVersions branch from 1bd8038 to c089ae4 Compare May 19, 2020 23:19
@jonathan-gramain
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Reset complete

I have successfully deleted this pull request's integration branches.

This was referenced May 19, 2020
Closed
Closed
@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.

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Waiting for approval

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

  • the author

  • 2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

@jonathan-gramain
Copy link
Contributor Author

@miniscruff I also implemented what you suggested in #1028 about having an object for mapping format version numbers to method names. It should also (slightly) improve performance by avoiding an explicit comparison on the version number at each call, explicitly for the filter() method which is called for every entry to list.

@jonathan-gramain jonathan-gramain force-pushed the bugfix/S3C-2899-vformatV1delimiterVersions branch from c089ae4 to c9ba4c1 Compare May 19, 2020 23:29
@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

History mismatch

Merge commit #c089ae41238a102bd121adcc0dbc4fe149a91e90 on the integration branch
w/7.7/bugfix/S3C-2899-vformatV1delimiterVersions is merging a branch which is neither the current
branch bugfix/S3C-2899-vformatV1delimiterVersions nor the development branch
development/7.7.

It is likely due to a rebase of the branch bugfix/S3C-2899-vformatV1delimiterVersions and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@jonathan-gramain
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Reset complete

I have successfully deleted this pull request's integration branches.

This was referenced May 19, 2020
Closed
Closed
@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.

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Waiting for approval

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

  • the author

  • 2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

@jonathan-gramain
bugfix: S3C-2899 implement v1 format for DelimiterVersions listing
d66d924 
Implement the v1 versioning key format for DelimiterVersions listing
method, in addition to v0.

Enhance existing unit tests to check the result of getMDParams()
@jonathan-gramain jonathan-gramain force-pushed the bugfix/S3C-2899-vformatV1delimiterVersions branch from c9ba4c1 to d66d924 Compare May 19, 2020 23:45
@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

History mismatch

Merge commit #b431e35857eb1715ad5038b817bad58dd18c94cf on the integration branch
w/7.7/bugfix/S3C-2899-vformatV1delimiterVersions is merging a branch which is neither the current
branch bugfix/S3C-2899-vformatV1delimiterVersions nor the development branch
development/7.7.

It is likely due to a rebase of the branch bugfix/S3C-2899-vformatV1delimiterVersions and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@jonathan-gramain
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Reset complete

I have successfully deleted this pull request's integration branches.

This was referenced May 19, 2020
Merged
Merged
@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.

@bert-e
Copy link
Contributor

bert-e commented May 19, 2020

Waiting for approval

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

  • the author

  • 2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

@jonathan-gramain jonathan-gramain changed the base branch from development/7.4 to development/8.1 May 20, 2020 05:41
@bert-e
Copy link
Contributor

bert-e commented May 20, 2020

Branches have diverged

This pull request's source branch bugfix/S3C-2899-vformatV1delimiterVersions has diverged from
development/8.1 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/8.1 into bugfix/S3C-2899-vformatV1delimiterVersions
  • Rebase bugfix/S3C-2899-vformatV1delimiterVersions onto origin/development/8.1

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@jonathan-gramain jonathan-gramain changed the base branch from development/8.1 to development/7.4 May 20, 2020 05:41
@bert-e
Copy link
Contributor

bert-e commented May 20, 2020

Waiting for approval

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

  • the author

  • 2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

@jonathan-gramain
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented May 21, 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 21, 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 badaa85 into development/7.4 May 21, 2020
@bert-e bert-e deleted the bugfix/S3C-2899-vformatV1delimiterVersions branch May 21, 2020 22:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miniscruff miniscruff miniscruff approved these changes

@alexanderchan-scality alexanderchan-scality alexanderchan-scality approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jonathan-gramain @bert-e @miniscruff @alexanderchan-scality