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-nexus.git
commit f36686707d78b22a5f83dbbd6fd0ff2317228853 Merge: ff51bf7 645687b Author: rileykk <[email protected]> AuthorDate: Mon Nov 4 09:20:30 2024 -0800 Merge remote-tracking branch 'origin/develop' into master-conflicts # Conflicts: # CHANGELOG.md # README # docs/quickstart.rst # docs/release.rst # helm/templates/solr-create-collection.yml # helm/values.yaml # pyproject.toml # tests/requirements.txt
