Skip to content

MLE-12345 Merging master into develop #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 4, 2025
Merged

MLE-12345 Merging master into develop #571

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3489198
MLE-12345 Updated copyright
rjrudin Aug 5, 2025
5859248
Merge pull request #538 from marklogic/feature/copyright-update
rjrudin Aug 5, 2025
baa5012
Bumped to 2.7.0
rjrudin Aug 5, 2025
d61de9b
Merge pull request #542 from marklogic/release/2.7.0
rjrudin Aug 5, 2025
7a535e8
Bump rexml from 3.3.9 to 3.4.2 in /docs
dependabot[bot] Sep 17, 2025
006fa1e
Merge branch 'develop' into feature/temp-master
rjrudin Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.3.9)
rexml (3.4.2)
rouge (3.26.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=2.7-SNAPSHOT
version=2.7.0

# 3.5.0 caused test failures with our pushdown support, but that is not an issue with 3.5.3 - perhaps a bug fix in
# the Spark connector plumbing between 3.5.0 and 3.5.3. This also bumps Jackson to 2.15.2.
Expand Down
Loading