Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fba068b7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fba068b7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fba068b7 Branch: refs/heads/master Commit: fba068b7b5dab69428042f8e7fae50673079d7fe Parents: 8c05943 99c734c Author: Josh Elser <els...@apache.org> Authored: Mon Jun 1 18:41:33 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Jun 1 18:41:33 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/tserver/TabletServer.java | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fba068b7/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ----------------------------------------------------------------------