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 6b59207 Merge branch '2.0'
add 246db1a fixed time calculation to use nano delta (#1184)
add 27753af Merge remote-tracking branch 'upstream/1.9' into 2.0
new ed275f2 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:
.../java/org/apache/accumulo/tserver/tablet/Tablet.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
