janhoy commented on PR #4177:
URL: https://github.com/apache/solr/pull/4177#issuecomment-6779305775
🤖 Claude Fable 5 merged `upstream/main` into this branch (220 commits
behind) and resolved the conflicts. Follow-up commits on top of the merge:
**Conflicts resolved in the merge commit**
- `indexing-with-update-handlers.adoc`, `partial-document-updates.adoc`,
`transforming-and-indexing-custom-json.adoc` (20 hunks): this PR rebuilt the
examples into V1/V2 tab blocks while main standardized every curl example
(SOLR-18460, SOLR-18495, SOLR-18500). Took this PR's structure in every hunk;
the text main had edited in place (posting XML from a file, response format)
already lives elsewhere in the PR's restructured pages.
- `core-overview.js`, `cores.js`: took main's updated injection lists
(`$timeout`, `ReplicationV2`, `NodeTarget`, `ApiErrorHandler`) minus the
`Update` service this PR removes.
- `services.js`: dropped the `Update` `$resource` factory as this PR does,
kept main's new `ParamSetsV2` factory next to it.
**Semantic conflicts, 8afa6bd and the commit after it**: the `api.mustache`
change on this branch gives every generated multi-content-type request a
`contentType` argument. Callers added on main since this PR branched (`bin/solr
create` from SOLR-18320, `TestDistribFileStore`,
`ConfigsetPinnedPackageVersionTest`) now pass `application/zip` or
`application/octet-stream`, matching this PR's own adaptations.
`UpdateAPIMetricsDoubleCountingTest` imports `ContentStreamBase` from its new
home in solr-core (SOLR-18351).
**Curl conventions, b98bc2f**: swept the three pages above to main's current
style: `{collectionName}` placeholders, quoted URLs, `--data-binary` for update
payloads, one command per line. Mechanical, no wording changes.
Validated locally with `compileTestJava`, the Admin UI browser suite
(`-Ptests.selenium=true`) and the Ref Guide build with link check.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
