You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2019/07/03 13:51:26 UTC
[accumulo] branch master updated (f7fd504 -> 436f404)
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from f7fd504 Merge pull request #1241 from keith-turner/accumulo-1122
add aebaf86 fix #1231 prevent hadoop shutdown hook from failing FATE tx (#1245)
add 7268fcf Make bulk import move idempotent (#1246)
new 436f404 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:
...BadArgumentException.java => ShutdownUtil.java} | 19 ++++++++---
.../main/java/org/apache/accumulo/fate/Fate.java | 38 ++++++++++++++++++++++
.../master/tableOps/bulkVer2/BulkImportMove.java | 25 +++++++++++++-
.../apache/accumulo/tserver/tablet/Scanner.java | 3 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 17 ++--------
5 files changed, 80 insertions(+), 22 deletions(-)
copy core/src/main/java/org/apache/accumulo/core/util/{BadArgumentException.java => ShutdownUtil.java} (73%)
[accumulo] 01/01: Merge branch '2.0'
Posted by kt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 436f404e247114737eb6a499799cf90f1a201620
Merge: f7fd504 7268fcf
Author: Keith Turner <kt...@apache.org>
AuthorDate: Wed Jul 3 09:43:33 2019 -0400
Merge branch '2.0'
.../apache/accumulo/core/util/ShutdownUtil.java | 36 ++++++++++++++++++++
.../main/java/org/apache/accumulo/fate/Fate.java | 38 ++++++++++++++++++++++
.../master/tableOps/bulkVer2/BulkImportMove.java | 25 +++++++++++++-
.../apache/accumulo/tserver/tablet/Scanner.java | 3 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 17 ++--------
5 files changed, 102 insertions(+), 17 deletions(-)