You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2019/07/10 20:12:21 UTC

[accumulo] branch master updated (59ef41b -> d10f264)

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

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


    from 59ef41b  Merge branch '2.0'
     add 5a4a969  Improve ID javadoc (#1261)
     add 477a9cd  Improve error handling in Monitor. Fixes #1258 (#1262)
     new d10f264  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:
 .../org/apache/accumulo/core/data/AbstractId.java  |  2 +-
 .../org/apache/accumulo/core/data/NamespaceId.java |  3 +-
 .../org/apache/accumulo/core/data/TableId.java     |  5 +--
 .../java/org/apache/accumulo/monitor/Monitor.java  |  1 +
 .../rest/bulkImports/BulkImportResource.java       |  9 +++--
 .../monitor/rest/master/MasterResource.java        |  6 +++-
 .../accumulo/monitor/rest/scans/ScansResource.java |  8 +++--
 .../monitor/rest/status/StatusResource.java        | 10 +++---
 .../monitor/rest/tables/TablesResource.java        | 38 ++++++++++++----------
 .../rest/tservers/TabletServerResource.java        | 13 ++++----
 10 files changed, 58 insertions(+), 37 deletions(-)


[accumulo] 01/01: Merge branch '2.0'

Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit d10f26474fd9740a94e7d0af9c8592050bb7ee29
Merge: 59ef41b 477a9cd
Author: Mike Miller <mm...@apache.org>
AuthorDate: Wed Jul 10 16:11:50 2019 -0400

    Merge branch '2.0'

 .../org/apache/accumulo/core/data/AbstractId.java  |  2 +-
 .../org/apache/accumulo/core/data/NamespaceId.java |  3 +-
 .../org/apache/accumulo/core/data/TableId.java     |  5 +--
 .../java/org/apache/accumulo/monitor/Monitor.java  |  1 +
 .../rest/bulkImports/BulkImportResource.java       |  9 +++--
 .../monitor/rest/master/MasterResource.java        |  6 +++-
 .../accumulo/monitor/rest/scans/ScansResource.java |  8 +++--
 .../monitor/rest/status/StatusResource.java        | 10 +++---
 .../monitor/rest/tables/TablesResource.java        | 38 ++++++++++++----------
 .../rest/tservers/TabletServerResource.java        | 13 ++++----
 10 files changed, 58 insertions(+), 37 deletions(-)