Bump arsenal from 7.4.13 to 8.1.20#4187
Closed
dependabot[bot] wants to merge 1 commit intodevelopment/7.4from
Closed
Bump arsenal from 7.4.13 to 8.1.20#4187dependabot[bot] wants to merge 1 commit intodevelopment/7.4from
dependabot[bot] wants to merge 1 commit intodevelopment/7.4from
Conversation
Bumps [arsenal](https://github.com/scality/Arsenal) from 7.4.13 to 8.1.20. - [Release notes](https://github.com/scality/Arsenal/releases) - [Commits](scality/Arsenal@5ce057a...59a6798) --- updated-dependencies: - dependency-name: arsenal dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
bot
added
the
dependencies
Contributor
Hello dependabot[bot],My role is to assist you with the merge of this Status report is not available. The following options are set: bypass_author_approval, bypass_jira_check |
Contributor
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/7.10/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.20 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.20
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.20The following options are set: bypass_author_approval, bypass_jira_check |
Contributor
Author
|
Superseded by #4190. |
dependabot
bot
deleted the
dependabot/npm_and_yarn/development/7.4/arsenal-8.1.20
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bumps arsenal from 7.4.13 to 8.1.20.
Release notes
Sourced from arsenal's releases.
Commits
59a6798Merge remote-tracking branch 'origin/improvement/ARSN-53-bump-to-7-10-6' into...8b18466improvement: ARSN-53 bump version to 7.10.626da124Merge branches 'w/8.1/bugfix/ARSN-50-object-retention-date-with-sub-seconds-f...d5dad47Merge branch 'bugfix/ARSN-50-object-retention-date-with-sub-seconds-fails' in...47b121cMerge branches 'w/8.1/improvement/ARSN-21-Upgrade-Node-to-16' and 'q/1649/7.1...e7869d8Merge branches 'w/7.10/improvement/ARSN-21-Upgrade-Node-to-16' and 'q/1649/7....a1e14fcMerge branch 'improvement/ARSN-21-Upgrade-Node-to-16' into q/7.4c605c1efeature: ARSN-21 add missing abort method994bd0aMerge branch 'bugfix/ARSN-50-object-retention-date-with-sub-seconds-fails' in...f0981e2bf: ARSN-50 object retention date with sub seconds should not failDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)