accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [54/54] [abbrv] accumulo git commit: Merge branch 'pr-242'
Date Thu, 06 Jul 2017 20:43:48 GMT
Merge branch 'pr-242'

This closes #242


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b7927ba
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b7927ba
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b7927ba

Branch: refs/heads/master
Commit: 0b7927ba997ce5f2d8364c3f5fcee884e9c69766
Parents: 41b792d 335d160
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Jul 6 16:41:55 2017 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jul 6 16:41:55 2017 -0400

----------------------------------------------------------------------
 assemble/pom.xml                                |  120 +
 assemble/src/main/assemblies/component.xml      |   32 +
 .../org/apache/accumulo/core/conf/Property.java |    3 +
 pom.xml                                         |  167 +-
 server/monitor/pom.xml                          |   45 +-
 .../accumulo/monitor/EmbeddedWebServer.java     |   77 +-
 .../org/apache/accumulo/monitor/Monitor.java    |  124 +-
 .../apache/accumulo/monitor/rest/Totals.java    |   51 +
 .../accumulo/monitor/rest/XMLInformation.java   |  113 +
 .../accumulo/monitor/rest/XMLResource.java      |   69 +
 .../monitor/rest/bulkImports/BulkImport.java    |   55 +
 .../rest/bulkImports/BulkImportInformation.java |   51 +
 .../rest/bulkImports/BulkImportResource.java    |   76 +
 .../TabletServerBulkImportInformation.java      |   52 +
 .../monitor/rest/gc/GarbageCollection.java      |   67 +
 .../monitor/rest/gc/GarbageCollectorCycle.java  |   60 +
 .../rest/gc/GarbageCollectorResource.java       |  137 +
 .../monitor/rest/gc/GarbageCollectorStatus.java |   54 +
 .../rest/logs/DeadLoggerInformation.java        |   57 +
 .../monitor/rest/logs/DeadLoggerList.java       |   48 +
 .../accumulo/monitor/rest/logs/LogEvent.java    |   57 +
 .../accumulo/monitor/rest/logs/LogResource.java |   90 +
 .../monitor/rest/master/MasterInformation.java  |  151 +
 .../monitor/rest/master/MasterResource.java     |  238 +
 .../monitor/rest/problems/ProblemDetail.java    |   48 +
 .../rest/problems/ProblemDetailInformation.java |   67 +
 .../monitor/rest/problems/ProblemSummary.java   |   48 +
 .../problems/ProblemSummaryInformation.java     |   59 +
 .../monitor/rest/problems/ProblemsResource.java |  165 +
 .../replication/ReplicationInformation.java     |   59 +
 .../rest/replication/ReplicationResource.java   |  204 +
 .../monitor/rest/scans/ScanInformation.java     |   53 +
 .../accumulo/monitor/rest/scans/Scans.java      |   48 +
 .../monitor/rest/scans/ScansResource.java       |   64 +
 .../rest/statistics/StatisticsResource.java     |  292 +
 .../monitor/rest/status/StatusInformation.java  |   64 +
 .../monitor/rest/status/StatusResource.java     |  120 +
 .../monitor/rest/tables/CompactionsList.java    |   46 +
 .../monitor/rest/tables/CompactionsTypes.java   |   50 +
 .../monitor/rest/tables/TableInformation.java   |  147 +
 .../rest/tables/TableInformationList.java       |   48 +
 .../monitor/rest/tables/TableNamespace.java     |   54 +
 .../monitor/rest/tables/TablesList.java         |   48 +
 .../monitor/rest/tables/TablesResource.java     |  272 +
 .../monitor/rest/trace/AddlInformation.java     |   59 +
 .../rest/trace/AnnotationInformation.java       |   46 +
 .../monitor/rest/trace/DataInformation.java     |   46 +
 .../rest/trace/RecentTracesInformation.java     |   75 +
 .../monitor/rest/trace/RecentTracesList.java    |   48 +
 .../rest/trace/RecoveryStatusInformation.java   |   64 +
 .../monitor/rest/trace/TraceInformation.java    |   65 +
 .../accumulo/monitor/rest/trace/TraceList.java  |   68 +
 .../accumulo/monitor/rest/trace/TraceType.java  |   57 +
 .../rest/trace/TracesForTypeInformation.java    |   80 +
 .../monitor/rest/trace/TracesResource.java      |  372 +
 .../rest/tservers/AllTimeTabletResults.java     |   71 +
 .../tservers/BadTabletServerInformation.java    |   51 +
 .../monitor/rest/tservers/BadTabletServers.java |   49 +
 .../rest/tservers/CurrentOperations.java        |   87 +
 .../rest/tservers/CurrentTabletResults.java     |   54 +
 .../rest/tservers/DeadServerInformation.java    |   57 +
 .../monitor/rest/tservers/DeadServerList.java   |   48 +
 .../tservers/ServerShuttingDownInformation.java |   45 +
 .../monitor/rest/tservers/ServerStat.java       |   54 +
 .../monitor/rest/tservers/ServerStats.java      |   48 +
 .../rest/tservers/ServersShuttingDown.java      |   48 +
 .../monitor/rest/tservers/TabletServer.java     |   47 +
 .../tservers/TabletServerDetailInformation.java |   58 +
 .../rest/tservers/TabletServerInformation.java  |  159 +
 .../TabletServerRecoveryInformation.java        |   54 +
 .../rest/tservers/TabletServerResource.java     |  331 +
 .../rest/tservers/TabletServerSummary.java      |   67 +
 .../TabletServerWithTableInformation.java       |   48 +
 .../monitor/rest/tservers/TabletServers.java    |   64 +
 .../rest/tservers/TabletServersRecovery.java    |   49 +
 .../accumulo/monitor/rest/zk/ZKInformation.java |   48 +
 .../accumulo/monitor/rest/zk/ZooKeeper.java     |   51 +
 .../monitor/rest/zk/ZookeeperResource.java      |   56 +
 .../accumulo/monitor/servlets/BasicServlet.java |  285 -
 .../monitor/servlets/BulkImportServlet.java     |   91 -
 .../monitor/servlets/DefaultServlet.java        |  290 -
 .../monitor/servlets/GcStatusServlet.java       |   72 -
 .../accumulo/monitor/servlets/JSONServlet.java  |  102 -
 .../accumulo/monitor/servlets/LogServlet.java   |  114 -
 .../monitor/servlets/MasterServlet.java         |  203 -
 .../monitor/servlets/OperationServlet.java      |  208 -
 .../monitor/servlets/ProblemServlet.java        |  196 -
 .../monitor/servlets/ReplicationServlet.java    |  167 -
 .../accumulo/monitor/servlets/ScanServlet.java  |   65 -
 .../accumulo/monitor/servlets/ShellServlet.java |  375 -
 .../monitor/servlets/TServersServlet.java       |  372 -
 .../monitor/servlets/TablesServlet.java         |  216 -
 .../accumulo/monitor/servlets/VisServlet.java   |  236 -
 .../accumulo/monitor/servlets/XMLServlet.java   |  179 -
 .../accumulo/monitor/servlets/trace/Basic.java  |  165 -
 .../monitor/servlets/trace/ListType.java        |   95 -
 .../servlets/trace/NullKeyValueIterator.java    |   40 -
 .../monitor/servlets/trace/NullScanner.java     |  159 -
 .../monitor/servlets/trace/ShowTrace.java       |  190 -
 .../servlets/trace/ShowTraceLinkType.java       |   49 -
 .../monitor/servlets/trace/Summary.java         |  201 -
 .../org/apache/accumulo/monitor/util/Table.java |  275 -
 .../accumulo/monitor/util/TableColumn.java      |   48 -
 .../apache/accumulo/monitor/util/TableRow.java  |   68 -
 .../util/celltypes/BulkImportStateType.java     |   45 -
 .../monitor/util/celltypes/CellType.java        |   38 -
 .../monitor/util/celltypes/CompactionsType.java |   73 -
 .../monitor/util/celltypes/DateTimeType.java    |   67 -
 .../monitor/util/celltypes/DurationType.java    |   52 -
 .../monitor/util/celltypes/NumberType.java      |  119 -
 .../monitor/util/celltypes/PercentageType.java  |   42 -
 .../util/celltypes/PreciseNumberType.java       |   43 -
 .../util/celltypes/ProgressChartType.java       |   60 -
 .../monitor/util/celltypes/StringType.java      |   42 -
 .../monitor/util/celltypes/TServerLinkType.java |   53 -
 .../monitor/util/celltypes/TableLinkType.java   |   60 -
 .../monitor/util/celltypes/TableStateType.java  |   59 -
 .../apache/accumulo/monitor/view/WebViews.java  |  383 +
 .../src/main/resources/resources/css/screen.css |  468 +
 .../main/resources/resources/images/favicon.png |  Bin 0 -> 2195 bytes
 .../main/resources/resources/js/bulkImport.js   |  205 +
 .../resources/resources/js/flot/LICENSE.txt     |   22 +
 .../resources/resources/js/flot/excanvas.js     | 1428 +++
 .../resources/resources/js/flot/excanvas.min.js |    1 +
 .../resources/js/flot/jquery.colorhelpers.js    |  180 +
 .../js/flot/jquery.colorhelpers.min.js          |    1 +
 .../resources/js/flot/jquery.flot.canvas.js     |  345 +
 .../resources/js/flot/jquery.flot.canvas.min.js |    7 +
 .../resources/js/flot/jquery.flot.categories.js |  190 +
 .../js/flot/jquery.flot.categories.min.js       |    7 +
 .../resources/js/flot/jquery.flot.crosshair.js  |  176 +
 .../js/flot/jquery.flot.crosshair.min.js        |    7 +
 .../resources/js/flot/jquery.flot.errorbars.js  |  353 +
 .../js/flot/jquery.flot.errorbars.min.js        |    7 +
 .../js/flot/jquery.flot.fillbetween.js          |  226 +
 .../js/flot/jquery.flot.fillbetween.min.js      |    7 +
 .../resources/js/flot/jquery.flot.image.js      |  241 +
 .../resources/js/flot/jquery.flot.image.min.js  |    7 +
 .../resources/resources/js/flot/jquery.flot.js  | 3168 ++++++
 .../resources/js/flot/jquery.flot.min.js        |    8 +
 .../resources/js/flot/jquery.flot.navigate.js   |  346 +
 .../js/flot/jquery.flot.navigate.min.js         |    7 +
 .../resources/js/flot/jquery.flot.pie.js        |  820 ++
 .../resources/js/flot/jquery.flot.pie.min.js    |    7 +
 .../resources/js/flot/jquery.flot.resize.js     |   59 +
 .../resources/js/flot/jquery.flot.resize.min.js |    7 +
 .../resources/js/flot/jquery.flot.selection.js  |  360 +
 .../js/flot/jquery.flot.selection.min.js        |    7 +
 .../resources/js/flot/jquery.flot.stack.js      |  188 +
 .../resources/js/flot/jquery.flot.stack.min.js  |    7 +
 .../resources/js/flot/jquery.flot.symbol.js     |   71 +
 .../resources/js/flot/jquery.flot.symbol.min.js |    7 +
 .../resources/js/flot/jquery.flot.threshold.js  |  142 +
 .../js/flot/jquery.flot.threshold.min.js        |    7 +
 .../resources/js/flot/jquery.flot.time.js       |  432 +
 .../resources/js/flot/jquery.flot.time.min.js   |    7 +
 .../main/resources/resources/js/flot/jquery.js  | 9472 ++++++++++++++++++
 .../resources/resources/js/flot/jquery.min.js   |    5 +
 .../main/resources/resources/js/functions.js    |  802 ++
 .../src/main/resources/resources/js/gc.js       |  171 +
 .../src/main/resources/resources/js/global.js   |   96 +
 .../src/main/resources/resources/js/listType.js |  140 +
 .../src/main/resources/resources/js/log.js      |  176 +
 .../src/main/resources/resources/js/master.js   |  242 +
 .../src/main/resources/resources/js/navbar.js   |  133 +
 .../src/main/resources/resources/js/overview.js |  264 +
 .../src/main/resources/resources/js/problems.js |  227 +
 .../main/resources/resources/js/replication.js  |  131 +
 .../src/main/resources/resources/js/scans.js    |  129 +
 .../src/main/resources/resources/js/server.js   |  412 +
 .../src/main/resources/resources/js/show.js     |  158 +
 .../src/main/resources/resources/js/summary.js  |  138 +
 .../src/main/resources/resources/js/table.js    |  177 +
 .../src/main/resources/resources/js/tables.js   |  333 +
 .../src/main/resources/resources/js/tservers.js |  314 +
 .../src/main/resources/resources/js/vis.js      |  506 +
 .../src/main/resources/templates/bulkImport.ftl |   28 +
 .../src/main/resources/templates/default.ftl    |   71 +
 .../src/main/resources/templates/footer.ftl     |   44 +
 .../monitor/src/main/resources/templates/gc.ftl |   23 +
 .../src/main/resources/templates/listType.ftl   |   32 +
 .../src/main/resources/templates/log.ftl        |   22 +
 .../src/main/resources/templates/master.ftl     |   29 +
 .../src/main/resources/templates/modals.ftl     |   38 +
 .../src/main/resources/templates/navbar.ftl     |   85 +
 .../src/main/resources/templates/overview.ftl   |   90 +
 .../src/main/resources/templates/problems.ftl   |   36 +
 .../main/resources/templates/replication.ftl    |   22 +
 .../src/main/resources/templates/scans.ftl      |   22 +
 .../src/main/resources/templates/server.ftl     |   49 +
 .../src/main/resources/templates/show.ftl       |   67 +
 .../src/main/resources/templates/summary.ftl    |   35 +
 .../src/main/resources/templates/table.ftl      |   34 +
 .../src/main/resources/templates/tables.ftl     |   44 +
 .../src/main/resources/templates/tservers.ftl   |   28 +
 .../src/main/resources/templates/vis.ftl        |   72 +
 server/monitor/src/main/resources/web/down.gif  |  Bin 164 -> 0 bytes
 .../monitor/src/main/resources/web/favicon.png  |  Bin 2195 -> 0 bytes
 .../src/main/resources/web/flot/LICENSE.txt     |   22 -
 .../src/main/resources/web/flot/excanvas.js     | 1427 ---
 .../src/main/resources/web/flot/excanvas.min.js |    1 -
 .../resources/web/flot/jquery.colorhelpers.js   |  179 -
 .../web/flot/jquery.colorhelpers.min.js         |    1 -
 .../resources/web/flot/jquery.flot.crosshair.js |  167 -
 .../web/flot/jquery.flot.crosshair.min.js       |    1 -
 .../web/flot/jquery.flot.fillbetween.js         |  183 -
 .../web/flot/jquery.flot.fillbetween.min.js     |    1 -
 .../resources/web/flot/jquery.flot.image.js     |  238 -
 .../resources/web/flot/jquery.flot.image.min.js |    1 -
 .../src/main/resources/web/flot/jquery.flot.js  | 2599 -----
 .../main/resources/web/flot/jquery.flot.min.js  |    6 -
 .../resources/web/flot/jquery.flot.navigate.js  |  336 -
 .../web/flot/jquery.flot.navigate.min.js        |    1 -
 .../main/resources/web/flot/jquery.flot.pie.js  |  750 --
 .../resources/web/flot/jquery.flot.pie.min.js   |    1 -
 .../resources/web/flot/jquery.flot.resize.js    |   60 -
 .../web/flot/jquery.flot.resize.min.js          |    1 -
 .../resources/web/flot/jquery.flot.selection.js |  344 -
 .../web/flot/jquery.flot.selection.min.js       |    1 -
 .../resources/web/flot/jquery.flot.stack.js     |  184 -
 .../resources/web/flot/jquery.flot.stack.min.js |    1 -
 .../resources/web/flot/jquery.flot.symbol.js    |   70 -
 .../web/flot/jquery.flot.symbol.min.js          |    1 -
 .../resources/web/flot/jquery.flot.threshold.js |  103 -
 .../web/flot/jquery.flot.threshold.min.js       |    1 -
 .../src/main/resources/web/flot/jquery.js       | 8316 ---------------
 .../src/main/resources/web/flot/jquery.min.js   |   23 -
 .../monitor/src/main/resources/web/functions.js |   21 -
 .../monitor/src/main/resources/web/screen.css   |  429 -
 server/monitor/src/main/resources/web/up.gif    |  Bin 165 -> 0 bytes
 server/monitor/src/main/resources/web/vis.js    |  409 -
 .../monitor/servlets/trace/BasicTest.java       |   55 -
 .../monitor/servlets/trace/SummaryTest.java     |   42 -
 .../util/celltypes/PreciseNumberTypeTest.java   |   36 -
 .../ThriftServerBindsBeforeZooKeeperLockIT.java |    8 +-
 235 files changed, 31239 insertions(+), 21376 deletions(-)
----------------------------------------------------------------------



Mime
View raw message