Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8959d264
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8959d264
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8959d264
Branch: refs/heads/master
Commit: 8959d264634315d3e9c4b45f8f9832b429183798
Parents: fbcf2f5 ad1c807
Author: Keith Turner <ktur...@apache.org>
Authored: Fri Sep 19 17:27:09 2014 -0400
Committer: Keith Turner <ktur...@apache.org>
Committed: Fri Sep 19 17:27:09 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/tserver/Tablet.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
