Bump arsenal from 7.4.14 to 8.1.24#4222
Bump arsenal from 7.4.14 to 8.1.24#4222dependabot[bot] wants to merge 1 commit intodevelopment/7.4from
Conversation
Bumps [arsenal](https://github.com/scality/arsenal) from 7.4.14 to 8.1.24. - [Release notes](https://github.com/scality/arsenal/releases) - [Commits](scality/Arsenal@030f47a...49239cc) --- updated-dependencies: - dependency-name: arsenal dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
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 |
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.24 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.24
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.24The following options are set: bypass_author_approval, bypass_jira_check |
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( git fetch && \
git checkout origin/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.24 && \
git merge origin/development/7.4Resolve merge conflicts and commit git push origin HEAD:dependabot/npm_and_yarn/development/7.4/arsenal-8.1.24The following options are set: bypass_author_approval, bypass_jira_check |
|
Superseded by #4228. |
dependabot
bot
deleted the
dependabot/npm_and_yarn/development/7.4/arsenal-8.1.24
branch
1 participant
Bumps arsenal from 7.4.14 to 8.1.24.
Release notes
Sourced from arsenal's releases.
Commits
49239ccMerge remote-tracking branch 'origin/w/7.10/bugfix/ARSN-57-correct-logging-cl...4dc39e3Merge branch 'bugfix/ARSN-57-correct-logging-client-ip' into tmp/octopus/w/7....9b9a866bf: ARSN-57 log correct client ip8d17fcaARSN-56: bump arsenal version to v8.1.231c3fcc5ARSN-56: fix uppercase at the beginning of actionmap708aab7ARSN-55: v8.1.22 as tag 8.1.21 already exists3a1cbdeARSN-55: add new action map38705d1Merge branch 'feature/ARSN-54/RevertNode16Changes' into tmp/octopus/w/7.10/fe...faf5701Merge branch 'w/7.10/feature/ARSN-54/RevertNode16Changes' into tmp/octopus/w/...efb3629feature: ARSN-54 use a less strict node engineDependabot 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)