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

2019-09-05 Thread edcoleman 
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 01e780afeef16ccf056c3e72e4ac3f904807acac
Merge: ffe158f 81027c0
Author: Ed Coleman 
AuthorDate: Thu Sep 5 16:02:52 2019 -0400

Merge branch '2.0'

 .../java/org/apache/accumulo/master/tableOps/compact/CompactRange.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

2019-07-24 Thread mmiller 
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 2ca12d9b2bcfe3c199ce355648bf7cd2a6ccf55d
Merge: 52d5d8e b9cc144
Author: Mike Miller 
AuthorDate: Wed Jul 24 18:34:56 2019 -0400

Merge branch '2.0'

 .../org/apache/accumulo/core/clientImpl/TableOperationsImpl.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)