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

Improvement/artesca 13354 office 365 v8 support #771

Merged

Conversation

JeanMarcMilletScality
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Sep 9, 2024

Hello jeanmarcmilletscality,

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.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Sep 9, 2024

Request integration branches

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.

@JeanMarcMilletScality JeanMarcMilletScality changed the base branch from development/2.2 to development/3.0 September 9, 2024 14:56
@bert-e
Copy link
Contributor

bert-e commented Sep 9, 2024

Waiting for approval

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

  • the author

  • one peer

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

@bert-e
Copy link
Contributor

bert-e commented Sep 9, 2024

Waiting for approval

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

  • the author

  • one peer

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

@JeanMarcMilletScality JeanMarcMilletScality force-pushed the improvement/ARTESCA-13354-office-365-v8-support branch 2 times, most recently from 6ad64e4 to 4236ec0 Compare September 9, 2024 16:07
@bert-e
Copy link
Contributor

bert-e commented Sep 9, 2024

Conflict

There is a conflict between your branch improvement/ARTESCA-13354-office-365-v8-support and the
destination branch development/3.0.

Please resolve the conflict on the feature branch (improvement/ARTESCA-13354-office-365-v8-support).

git fetch && \
git checkout origin/improvement/ARTESCA-13354-office-365-v8-support && \
git merge origin/development/3.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/ARTESCA-13354-office-365-v8-support

@JeanMarcMilletScality JeanMarcMilletScality force-pushed the improvement/ARTESCA-13354-office-365-v8-support branch from 4236ec0 to 5f7ab4a Compare September 9, 2024 16:15
@bert-e
Copy link
Contributor

bert-e commented Sep 9, 2024

Waiting for approval

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

  • the author

  • one peer

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

Copy link
Contributor

@JBWatenbergScality JBWatenbergScality left a comment

Choose a reason for hiding this comment

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

LGTM !

Comment on lines +242 to +243
veeamTagApplication === VeeamApplicationType.VEEAM_OFFICE_365 ||
veeamTagApplication === VeeamApplicationType.VEEAM_OFFICE_365_V8) &&
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: could be simplified [VeeamApplicationType.VEEAM_BACKUP_REPLICATION, VeeamApplicationType.VEEAM_OFFICE_365, VeeamApplicationType.VEEAM_OFFICE_365_V8].includes(veeamTagApplication). not necessary to do it now, just a dumb suggestion

@bert-e
Copy link
Contributor

bert-e commented Sep 10, 2024

Waiting for approval

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

  • the author

  • one peer

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

@JBWatenbergScality
Copy link
Contributor

/bypass_author_approval

@bert-e
Copy link
Contributor

bert-e commented Sep 10, 2024

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

  • ✔️ development/3.0

The following branches have NOT changed:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0
  • development/2.1
  • development/2.2

Please check the status of the associated issue ARTESCA-13354.

Goodbye jeanmarcmilletscality.

The following options are set: bypass_author_approval

@bert-e bert-e merged commit 5f7ab4a into development/3.0 Sep 10, 2024
9 checks passed
@bert-e bert-e deleted the improvement/ARTESCA-13354-office-365-v8-support branch September 10, 2024 08: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.

3 participants