build(deps): bump arsenal from 7.4.11 to 8.1.13#4064
build(deps): bump arsenal from 7.4.11 to 8.1.13#4064dependabot[bot] wants to merge 1 commit intodevelopment/7.4from
Conversation
dependabot
bot
added
the
dependencies
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.13 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.13
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.13The 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.13 && \
git merge origin/development/7.4Resolve merge conflicts and commit git push origin HEAD:dependabot/npm_and_yarn/development/7.4/arsenal-8.1.13The following options are set: bypass_author_approval, bypass_jira_check |
Bumps [arsenal](https://github.com/scality/Arsenal) from 7.4.11 to 8.1.13. - [Release notes](https://github.com/scality/Arsenal/releases) - [Commits](scality/Arsenal@f941132...e912617) --- updated-dependencies: - dependency-name: arsenal dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
bot
force-pushed
the
dependabot/npm_and_yarn/development/7.4/arsenal-8.1.13
branch
from
8dde98f to
cccce8d
Compare
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.13 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.13
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.13The following options are set: bypass_author_approval, bypass_jira_check |
|
Superseded by #4084. |
dependabot
bot
deleted the
dependabot/npm_and_yarn/development/7.4/arsenal-8.1.13
branch
1 participant
Bumps arsenal from 7.4.11 to 8.1.13.
Release notes
Sourced from arsenal's releases.
Commits
e912617Merge branch 'improvement/ARSN-39-support-OIDC-principals-and-conditions' int...3abde0bimprovement: ARSN-39 support keycloak roles conditioncf49c7dMerge branch 'bugfix/ARSN-40/countItemsParseContentLength' into q/8.1e6e49a7ARSN-40: fix count-items helper to parse content-length as number77f9719feature: support mongodb collection shardinged1d6c1feature: ARSN-34 Add patch location constraints to index27f17f9improvement: ARSN-39 support keycloak groups condition4658651improvement: ARSN-39 support OIDC principals7af6a73Merge remote-tracking branch 'origin/w/7.10/feature/ARSN-38-replayPrefixHidde...8c2db87Merge remote-tracking branch 'origin/feature/ARSN-38-replayPrefixHiddenInList...Dependabot 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)