Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/60fe20ec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/60fe20ec Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/60fe20ec Branch: refs/heads/master Commit: 60fe20ece2400e81d6f6f317dfae1761af394d26 Parents: 87a684a fc92b25 Author: Josh Elser <els...@apache.org> Authored: Tue Jul 15 20:46:47 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Jul 15 20:46:47 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/util/TServerUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/60fe20ec/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java ----------------------------------------------------------------------
