This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from 7005006620 Merge remote-tracking branch 'upstream/2.1'
     add 6dfc6ea4a4 Monitor resources version bump and cleanup (#3754)
     add 2262125874 Remove popper changes to LICENSE files
     new ff916e6759 Merge branch '2.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 LICENSE                                            |   13 +-
 .../src/main/appended-resources/META-INF/LICENSE   |   13 +-
 .../resources/external/bootstrap/css/bootstrap.css | 7217 ++++++++++++--------
 .../external/bootstrap/css/bootstrap.css.map       |    1 -
 .../external/bootstrap/js/bootstrap.bundle.js      | 6314 +++++++++++++++++
 .../resources/external/bootstrap/js/bootstrap.js   | 5016 --------------
 .../external/bootstrap/js/bootstrap.js.map         |    1 -
 .../datatables/css/dataTables.bootstrap5.css       |   87 +-
 .../external/datatables/css/jquery.dataTables.css  |  578 --
 .../external/datatables/images/sort_asc.png        |  Bin 160 -> 0 bytes
 .../datatables/images/sort_asc_disabled.png        |  Bin 148 -> 0 bytes
 .../external/datatables/images/sort_both.png       |  Bin 201 -> 0 bytes
 .../external/datatables/images/sort_desc.png       |  Bin 158 -> 0 bytes
 .../datatables/images/sort_desc_disabled.png       |  Bin 146 -> 0 bytes
 .../datatables/js/dataTables.bootstrap5.js         |   86 +-
 .../external/datatables/js/jquery.dataTables.js    |  235 +-
 .../external/flot/jquery.flot.drawSeries.js        |  123 +-
 .../jquery/{jquery-3.6.1.js => jquery-3.7.1.js}    | 1915 +++---
 .../apache/accumulo/monitor/templates/default.ftl  |    4 +-
 19 files changed, 11791 insertions(+), 9812 deletions(-)
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/css/bootstrap.css.map
 create mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/js/bootstrap.bundle.js
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/js/bootstrap.js
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/js/bootstrap.js.map
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/css/jquery.dataTables.css
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/images/sort_asc.png
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/images/sort_asc_disabled.png
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/images/sort_both.png
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/images/sort_desc.png
 delete mode 100644 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/images/sort_desc_disabled.png
 rename 
server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery/{jquery-3.6.1.js
 => jquery-3.7.1.js} (88%)

Reply via email to