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/e06e8df8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e06e8df8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e06e8df8
Branch: refs/heads/master
Commit: e06e8df8255d48070328f92cd2cd623ac7c3cc31
Parents: 6bd2a45 444a889
Author: Eric C. Newton <eric.new...@gmail.com>
Authored: Tue Aug 5 08:57:30 2014 -0400
Committer: Eric C. Newton <eric.new...@gmail.com>
Committed: Tue Aug 5 08:57:30 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
