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 2014/03/06 00:05:38 UTC

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d7827e07
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d7827e07
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d7827e07

Branch: refs/heads/master
Commit: d7827e079497a87e42e337fab5a31a7635f58c00
Parents: 9c82498 80febfa
Author: Keith Turner <kt...@apache.org>
Authored: Wed Mar 5 18:06:37 2014 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Mar 5 18:06:37 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/tserver/RootFiles.java     |  8 +++-----
 .../java/org/apache/accumulo/tserver/Tablet.java   | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d7827e07/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------