You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by br...@apache.org on 2021/01/11 14:18:37 UTC

[accumulo] branch main updated (0f7b66d -> 7e98989)

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

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


    from 0f7b66d  Merge branch '1.10' into main
     add 7e98989  Use long instead of int for monitor scan rate (fixes #1858)

No new revisions were added by this update.

Summary of changes:
 LICENSE                                            |    6 +-
 assemble/src/main/resources/LICENSE                |    6 +-
 .../src/main/appended-resources/META-INF/LICENSE   |    6 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |   12 +-
 .../rest/statistics/StatisticsResource.java        |   12 +-
 .../accumulo/monitor/resources/css/screen.css      |    6 +
 .../monitor/resources/external/flot/excanvas.js    | 1428 --------
 .../external/flot/jquery.canvaswrapper.js          |  549 +++
 .../resources/external/flot/jquery.colorhelpers.js |  165 +-
 .../external/flot/jquery.flot.axislabels.js        |  212 ++
 .../resources/external/flot/jquery.flot.browser.js |   98 +
 .../resources/external/flot/jquery.flot.canvas.js  |  345 --
 .../external/flot/jquery.flot.categories.js        |   94 +-
 .../external/flot/jquery.flot.composeImages.js     |  330 ++
 .../external/flot/jquery.flot.crosshair.js         |  106 +-
 .../external/flot/jquery.flot.drawSeries.js        |  662 ++++
 .../external/flot/jquery.flot.errorbars.js         |  234 +-
 .../external/flot/jquery.flot.fillbetween.js       |  426 +--
 .../external/flot/jquery.flot.flatdata.js          |   47 +
 .../resources/external/flot/jquery.flot.hover.js   |  359 ++
 .../resources/external/flot/jquery.flot.image.js   |   92 +-
 .../monitor/resources/external/flot/jquery.flot.js | 3508 +++++++++-----------
 .../resources/external/flot/jquery.flot.legend.js  |  437 +++
 .../resources/external/flot/jquery.flot.logaxis.js |  298 ++
 .../external/flot/jquery.flot.navigate.js          |  856 ++++-
 .../resources/external/flot/jquery.flot.pie.js     | 1566 +++++----
 .../resources/external/flot/jquery.flot.resize.js  |   13 +-
 .../external/flot/jquery.flot.saturated.js         |   43 +
 .../external/flot/jquery.flot.selection.js         |  331 +-
 .../resources/external/flot/jquery.flot.stack.js   |  140 +-
 .../resources/external/flot/jquery.flot.symbol.js  |  123 +-
 .../external/flot/jquery.flot.threshold.js         |   83 +-
 .../resources/external/flot/jquery.flot.time.js    |  997 +++---
 .../resources/external/flot/jquery.flot.touch.js   |  320 ++
 .../external/flot/jquery.flot.touchNavigate.js     |  360 ++
 .../external/flot/jquery.flot.uiConstants.js       |   10 +
 .../accumulo/monitor/resources/js/overview.js      |   38 +-
 .../apache/accumulo/monitor/templates/default.ftl  |    7 +
 38 files changed, 8458 insertions(+), 5867 deletions(-)
 delete mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/excanvas.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.canvaswrapper.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.axislabels.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.browser.js
 delete mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.canvas.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.composeImages.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.drawSeries.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.flatdata.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.hover.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.legend.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.logaxis.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.saturated.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.touch.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.touchNavigate.js
 create mode 100644 server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/jquery.flot.uiConstants.js