Skip to content

Merge changes from xdmod11.0 branch to main branch.#2220

Merged
aaronweeden merged 14 commits into
ubccr:mainfrom
aaronweeden:merge-up-11.0
May 15, 2026
Merged

Merge changes from xdmod11.0 branch to main branch.#2220
aaronweeden merged 14 commits into
ubccr:mainfrom
aaronweeden:merge-up-11.0

Conversation

@aaronweeden
Copy link
Copy Markdown
Contributor

No description provided.

aestoltm and others added 13 commits October 28, 2025 10:56
Co-authored-by: Joe White <jpwhite4@buffalo.edu>
[Port 11.0] Have area plots only show tooltip when hovering on markers
* Merge pull request ubccr#2072 from eiffel777/add-memory-instance-state-machine

Add memory to cloud instance type ingestor sorting to prevent unique key errors

* Merge pull request ubccr#2084 from eiffel777/add-straight-join-metrics-explorer

Adding STRAIGHT_JOIN to metrics explorer/usage tab queries to improve performance

* Merge pull request ubccr#2160 from eiffel777/remove-groupby-cloud-staging

Update cloud instance type history ingestion process.

---------

Co-authored-by: Greg Dean <gmdean@buffalo.edu>
This is not used anymore.
Remove unused code in sab controller.
* Update to escaping function used

This commit ensures that information is correctly escaped for user
consumption.

* Updates per code review by @jpwhite4
* Charting Export Fixes for XDMoD 11.0
@aaronweeden aaronweeden force-pushed the merge-up-11.0 branch 2 times, most recently from 1a2d3a5 to c3a1067 Compare May 13, 2026 19:44
jpwhite4
jpwhite4 previously approved these changes May 14, 2026
Copy link
Copy Markdown
Member

@jpwhite4 jpwhite4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to also change the various migration script names from 11.0.2-11.5.0 to 11.0.3-11.5.0.

There is an etlv2 script that needs changing as well as php classes in Migration

@aaronweeden aaronweeden merged commit 2533deb into ubccr:main May 15, 2026
5 checks passed
@aaronweeden aaronweeden deleted the merge-up-11.0 branch May 15, 2026 18:18
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.

4 participants