Closed fredmnl closed 10 months ago
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.
Waiting for integration branch creation to be requested by the user.
To request integration branches, please comment on this pull request with the following command:
/create_integration_branches
Alternatively, the /approve
and /create_pull_requests
commands will automatically
create the integration branches.
Reviewers, as I commented during the retro, I'm removing the signed headers stuff from this PR so it only tackles the lifecycle config date part of it. I'll pick up that work in a subsequent PR. Hence the PR got even simpler.
/create_integration_branches
A conflict has been raised during the creation of
integration branch w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
with contents from bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
and development/7.70
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates origin/development/7.70
$ git merge origin/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
The following options are set: create_integration_branches
A conflict has been raised during the creation of
integration branch w/8.1/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
with contents from w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
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/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates origin/development/8.1
$ git merge origin/w/7.70/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.1/bugfix/ARSN-385/fully-align-with-aws-on-lifecycle-configuration-dates
The following options are set: create_integration_branches
The following approvals are needed before I can proceed with the merge:
the author
2 peers
The following options are set: create_integration_branches
/approve
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:
:heavy_check_mark: development/7.10
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.1
The following branches will NOT be impacted:
development/6.4
development/7.4
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.
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, create_integration_branches
I have successfully merged the changeset of this pull request into targetted development branches:
:heavy_check_mark: development/7.10
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.1
The following branches have NOT changed:
development/6.4
development/7.4
Please check the status of the associated issue ARSN-385.
Goodbye fredmnl.
Best reviewed as two commits.
One change is about the parsing of dates for lifecycle configurations, we wanted to align closely to AWS. The other change is what was needed to make the tests works in cloudserver, both against cloudserver and against AWS.