[accumulo] branch master updated (6b59207 -> ed275f2)

[ed...@apache.org]

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

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

[ed...@apache.org]

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 ed275f20c61b905a88c577422305871dad740992
Merge: 6b59207 27753af
Author: Ed Coleman <de...@etcoleman.com>
AuthorDate: Thu Jun 13 12:06:41 2019 -0400

    Merge branch '2.0'

 .../java/org/apache/accumulo/tserver/tablet/Tablet.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)