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/0e097ac5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0e097ac5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0e097ac5
Branch: refs/heads/master
Commit: 0e097ac59ebd2e6c74a97acff6b9598209426867
Parents: 7749cbc 7a8ec73
Author: Josh Elser <els...@apache.org>
Authored: Sun Jun 8 02:32:02 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Sun Jun 8 02:32:02 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/tserver/tablet/Tablet.java | 25 +++++-
.../accumulo/tserver/tablet/TabletTest.java | 83 ++++++++++++++++++++
2 files changed, 106 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
