Skip to content

Merge release/6.5 into master#1636

Merged
rjrudin merged 24 commits into
masterfrom
release/6.5
Jan 29, 2024
Merged

Merge release/6.5 into master#1636
rjrudin merged 24 commits into
masterfrom
release/6.5

Conversation

@rjrudin
Copy link
Copy Markdown
Contributor

@rjrudin rjrudin commented Jan 29, 2024

No description provided.

Improved the existing `testSQL` and added tests for no rows being returned.
DEVEXP-668 Added test for fromSql with no rows returned
Not sure why `output` was ever set to `execute` - removing it does not cause any breaks on MarkLogic 11.1, and the 11-nightly (properly) throws an error when it's included. So removing it.
For SSL and/or certificate authentication. Same approach as for a keystore, just for a truststore. 

Was able to reuse and improve `TwoWaySSLTest` by modifying it to use the key store as a trust store instead of using a "trust everything" trust manager.
Will submit a separate PR if/when the REST API is updated to throw a nicer error message.
MLE-4119: User can now submit an Optic update plan
MLE-4116: Can now configure trust store
Improved error message when Optic update plan fails
Moved a brittle test to get it out of the PR test suite.
Now using separate key and trust stores.
This test was expecting to fail because of a previous bug that was fixed back November.
@rjrudin rjrudin merged commit b68bab9 into master Jan 29, 2024
@rjrudin rjrudin deleted the release/6.5 branch January 29, 2024 14:55
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.

2 participants