You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ed...@apache.org on 2019/06/13 21:11:23 UTC

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

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(-)