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

2019-09-23 Thread ctubbsii
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 01ef69cc40e0a2455d8d5dab608a7561dc317b90
Merge: 6766d92 c03e0fe
Author: Christopher Tubbs 
AuthorDate: Mon Sep 23 19:02:23 2019 -0400

Merge branch '2.0'

 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




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

2019-07-29 Thread ctubbsii
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 e34ff60c3c1c66897ddcffd99b69447d10a255c9
Merge: 6045ab7 fc0f472
Author: Christopher Tubbs 
AuthorDate: Mon Jul 29 20:07:12 2019 -0400

Merge branch '2.0'

 pom.xml  | 12 
 test/pom.xml |  5 -
 2 files changed, 4 insertions(+), 13 deletions(-)




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

2019-07-29 Thread ctubbsii
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 2f913ec8edbfd497898ea06795fd016522db3012
Merge: 575afb9 5a6481f
Author: Christopher Tubbs 
AuthorDate: Mon Jul 29 15:09:23 2019 -0400

Merge branch '2.0'

 test/src/main/java/org/apache/accumulo/test/ShellServerIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)