Skip to content

Conversation

@timkimadobe
Copy link
Contributor

Description

This PR merges:

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have signed the Adobe Open Source CLA.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

timkimadobe and others added 9 commits December 4, 2024 16:09
Downmerge `main` -> `dev`
Downmerge `main` -> `dev`
* Update recoverable error codes (#170)

* add 507 error code as recoverable, handle negative retry-after, tests

* minor fix - comment

* Fix format of EdgeNetworkService and tests

* minor text updates

* fix network mock after rebase with dev

---------

Co-authored-by: Kevin Lind <[email protected]>

* Add exclusion for Edge back for Edge Consent dependency

* Use $mavenEdgeConsentVersion instead of hardcoded value

---------

Co-authored-by: Emilia Dobrin <[email protected]>
Co-authored-by: Kevin Lind <[email protected]>
`dev` -> `staging` [3.0.2] Update recoverable error codes
Downmerge `main` -> `dev` (Edge 3.0.1) Added support for the new MobileCore.initialize API intr…
`dev` -> `staging` Bringing in downmerge 3.0.1 changes
@timkimadobe timkimadobe merged commit f607561 into main Feb 26, 2025
11 checks passed
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.

4 participants