Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cbeac8eb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cbeac8eb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cbeac8eb Branch: refs/heads/master Commit: cbeac8ebfcfa0814300289efb01a211098b5dd1f Parents: f7fd298 f0ea80a Author: Eric Newton <[email protected]> Authored: Thu Dec 19 16:29:12 2013 -0500 Committer: Eric Newton <[email protected]> Committed: Thu Dec 19 16:29:12 2013 -0500 ---------------------------------------------------------------------- .../server/master/state/TServerInstance.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
