Merge branch '1.6.1-SNAPSHOT'
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a479e5d8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a479e5d8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a479e5d8
Branch: refs/heads/master
Commit: a479e5d87bd94790fe08f30123389023e79bfbe6
Parents: 862979a e1c9a1f
Author: Keith Turner <ktur...@apache.org>
Authored: Fri Sep 19 18:29:17 2014 -0400
Committer: Keith Turner <ktur...@apache.org>
Committed: Fri Sep 19 18:29:17 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/tserver/tablet/Tablet.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
