[accumulo] branch master updated (ce4dacd -> 09312c0)

[ed...@apache.org]

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

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


    from ce4dacd  Update Accumulo to build and run with Java 11 (#1196)
     add de9ba68  Allow master start to block waiting for a number of tservers (#1204)
     new 09312c0  Merge remote-tracking branch 'upstream/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/conf/Property.java    | 13 ++-
 .../java/org/apache/accumulo/master/Master.java    | 92 ++++++++++++++++++++++
 2 files changed, 104 insertions(+), 1 deletion(-)

[accumulo] 01/01: Merge remote-tracking branch 'upstream/2.0'

[ed...@apache.org]

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

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

commit 09312c09633abbdc07b396fae7a998081558e105
Merge: ce4dacd de9ba68
Author: Ed Coleman <de...@etcoleman.com>
AuthorDate: Thu Jun 13 17:08:47 2019 -0400

    Merge remote-tracking branch 'upstream/2.0'

 .../org/apache/accumulo/core/conf/Property.java    | 13 ++-
 .../java/org/apache/accumulo/master/Master.java    | 92 ++++++++++++++++++++++
 2 files changed, 104 insertions(+), 1 deletion(-)