cloudserver icon indicating copy to clipboard operation
cloudserver copied to clipboard

build(deps): bump arsenal from 7.4.16 to 8.1.66

Open dependabot[bot] opened this issue 3 years ago • 2 comments

Bumps arsenal from 7.4.16 to 8.1.66.

Release notes

Sourced from arsenal's releases.

Release 8.1.66

What's Changed

Full Changelog: https://github.com/scality/Arsenal/compare/8.1.65...8.1.66

Release 8.1.65

What's Changed

Full Changelog: https://github.com/scality/Arsenal/compare/8.1.64...8.1.65

Release v8.1.64

What's Changed

Full Changelog: https://github.com/scality/Arsenal/compare/8.1.63...8.1.64

Release v8.1.61

What's Changed

Full Changelog: https://github.com/scality/Arsenal/compare/8.1.60...8.1.61

v8.1.57

What's Changed

... (truncated)

Commits
  • 237872a Merge remote-tracking branch 'origin/feature/ARSN-265-release-7.10.33' into w...
  • 0130355 ARSN-265 release 7.10.33
  • 390fd97 Merge branch 'bugfix/ARSN-263/cb' into q/8.1
  • 1c9e4eb bump version
  • af50ef4 Merge branch 'bugfix/ARSN-255-revampEvaluatePolicyForTagConditions' into q/7.10
  • a4f163f Merge branches 'w/8.1/bugfix/ARSN-255-revampEvaluatePolicyForTagConditions' a...
  • 4d0cc9b ARSN-263 retrieveData callback should only be called once
  • 657f969 Merge branch 'bugfix/ARSN-262-fixRequestContextConstructor' into tmp/octopus/...
  • 4f2b1ca bugfix: ARSN-262 fixes/tests in RequestContext
  • b43cf22 Merge branch 'bugfix/ARSN-255-revampEvaluatePolicyForTagConditions' into tmp/...
  • Additional commits viewable in compare view

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 rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will 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 version will 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 dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

dependabot[bot] avatar Sep 02 '22 13:09 dependabot[bot]

Hello dependabot[bot],

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.

The following options are set: bypass_author_approval, bypass_jira_check

bert-e avatar Sep 02 '22 13:09 bert-e

Conflict

A conflict has been raised during the creation of integration branch w/7.10/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.66 with contents from dependabot/npm_and_yarn/development/7.4/arsenal-8.1.66 and development/7.10.

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.66 origin/development/7.10
 $ git merge origin/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.66
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/arsenal-8.1.66

The following options are set: bypass_author_approval, bypass_jira_check

bert-e avatar Sep 02 '22 13:09 bert-e

Superseded by #4812.

dependabot[bot] avatar Sep 27 '22 13:09 dependabot[bot]