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/71dc0527 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/71dc0527 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/71dc0527 Branch: refs/heads/master Commit: 71dc0527f7afd67d280f09597f9a099697be69ba Parents: d95d9ea 8f92585 Author: John Vines <jvi...@gmail.com> Authored: Mon Dec 9 11:19:06 2013 -0500 Committer: John Vines <jvi...@gmail.com> Committed: Mon Dec 9 11:19:06 2013 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
