(sdap-ingester) 01/01: Merge remote-tracking branch 'origin/develop' into master-conflicts

[rkk]

This is an automated email from the ASF dual-hosted git repository.

rkk pushed a commit to branch master-conflicts
in repository https://gitbox.apache.org/repos/asf/sdap-ingester.git

commit 472dedd7e2c101f7d70b446bffe6200e88b8d18f
Merge: 7fd65c2 96aa154
Author: rileykk <rile...@jpl.nasa.gov>
AuthorDate: Mon Nov 4 09:33:31 2024 -0800

    Merge remote-tracking branch 'origin/develop' into master-conflicts
    
    # Conflicts:
    #       CHANGELOG.md
    #       README
    #       VERSION.txt
    #       collection_manager/requirements.txt
    #       granule_ingester/pyproject.toml