This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 9c3497bfdc Constructed API methods for creating Mutations from key/value pairs (#5702) add ab4bafb1ea Refactor common code into Before/AfterEach blocks in FateIT (#5741) add 8779467e73 Allows the monitor to be hosted behind a proxy (#5729) new 2529d83754 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: assemble/pom.xml | 5 ++ .../org/apache/accumulo/core/conf/Property.java | 5 ++ pom.xml | 5 ++ server/monitor/pom.xml | 4 + .../apache/accumulo/monitor/EmbeddedWebServer.java | 21 ++++- .../java/org/apache/accumulo/monitor/Monitor.java | 11 ++- .../org/apache/accumulo/monitor/view/WebViews.java | 8 +- .../accumulo/monitor/resources/js/bulkImport.js | 2 +- .../accumulo/monitor/resources/js/compactions.js | 4 +- .../org/apache/accumulo/monitor/resources/js/ec.js | 8 +- .../accumulo/monitor/resources/js/functions.js | 28 +++---- .../org/apache/accumulo/monitor/resources/js/gc.js | 2 +- .../apache/accumulo/monitor/resources/js/global.js | 2 + .../accumulo/monitor/resources/js/manager.js | 6 +- .../apache/accumulo/monitor/resources/js/scans.js | 4 +- .../apache/accumulo/monitor/resources/js/server.js | 4 +- .../apache/accumulo/monitor/resources/js/table.js | 6 +- .../accumulo/monitor/resources/js/tservers.js | 8 +- .../apache/accumulo/monitor/templates/default.ftl | 31 +++---- .../apache/accumulo/monitor/templates/modals.ftl | 2 +- .../apache/accumulo/monitor/templates/navbar.ftl | 24 +++--- .../apache/accumulo/monitor/templates/overview.ftl | 8 +- .../apache/accumulo/monitor/templates/tables.ftl | 4 +- .../accumulo/monitor/EmbeddedWebServerTest.java | 98 ++++++++++++++++++++++ 24 files changed, 227 insertions(+), 73 deletions(-) create mode 100644 server/monitor/src/test/java/org/apache/accumulo/monitor/EmbeddedWebServerTest.java