This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 25315a6 Merge branch '2.0'
add d501204 Some monitor javascript updates (#1234)
new 71f8527 Merge branch '2.0'
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:
.../core/clientImpl/TableOperationsImpl.java | 2 +-
.../accumulo/monitor/resources/js/bulkImport.js | 30 +++++++++--------
.../accumulo/monitor/resources/js/functions.js | 4 +--
.../org/apache/accumulo/monitor/resources/js/gc.js | 6 ++--
.../accumulo/monitor/resources/js/listType.js | 6 ++--
.../apache/accumulo/monitor/resources/js/master.js | 6 ++--
.../accumulo/monitor/resources/js/overview.js | 8 ++---
.../accumulo/monitor/resources/js/problems.js | 12 +++----
.../accumulo/monitor/resources/js/replication.js | 6 ++--
.../apache/accumulo/monitor/resources/js/scans.js | 6 ++--
.../apache/accumulo/monitor/resources/js/server.js | 14 ++++----
.../apache/accumulo/monitor/resources/js/show.js | 6 ++--
.../accumulo/monitor/resources/js/summary.js | 6 ++--
.../apache/accumulo/monitor/resources/js/table.js | 6 ++--
.../accumulo/monitor/resources/js/tservers.js | 8 ++---
.../accumulo/monitor/templates/bulkImport.ftl | 21 +++++++-----
.../org/apache/accumulo/monitor/templates/gc.ftl | 25 ++++++++------
.../apache/accumulo/monitor/templates/listType.ftl | 8 +++--
.../org/apache/accumulo/monitor/templates/log.ftl | 10 +++---
.../apache/accumulo/monitor/templates/master.ftl | 23 ++++++++-----
.../apache/accumulo/monitor/templates/overview.ftl | 10 +++---
.../apache/accumulo/monitor/templates/problems.ftl | 20 +++++++----
.../accumulo/monitor/templates/replication.ftl | 11 +++---
.../apache/accumulo/monitor/templates/scans.ftl | 8 +++--
.../apache/accumulo/monitor/templates/server.ftl | 39 ++++++++++++++--------
.../org/apache/accumulo/monitor/templates/show.ftl | 9 +++--
.../apache/accumulo/monitor/templates/summary.ftl | 9 +++--
.../apache/accumulo/monitor/templates/table.ftl | 35 ++++++++++---------
.../apache/accumulo/monitor/templates/tables.ftl | 31 +++++++++--------
.../apache/accumulo/monitor/templates/tservers.ftl | 16 ++++++---
30 files changed, 233 insertions(+), 168 deletions(-)
