This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 71f8527db59552d4315a2aa9eded7125974f160c Merge: 25315a6 d501204 Author: Christopher Tubbs <[email protected]> AuthorDate: Wed Jun 26 14:52:05 2019 -0400 Merge branch '2.0' .../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(-)
