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

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

commit ff916e6759fbfd88d09b2ff0b3681d082c1e342e
Merge: 7005006620 2262125874
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Sep 20 14:13:08 2023 -0400

    Merge branch '2.1'

 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(-)


Reply via email to