Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/60969b3e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/60969b3e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/60969b3e Branch: refs/heads/master Commit: 60969b3e0abbead8d60afb3806d61589cf187f09 Parents: e595c17 7f1a55b Author: Josh Elser <els...@apache.org> Authored: Wed Nov 12 16:33:28 2014 -0800 Committer: Josh Elser <els...@apache.org> Committed: Wed Nov 12 16:33:28 2014 -0800 ---------------------------------------------------------------------- .../org/apache/accumulo/server/client/ClientServiceHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/60969b3e/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java ----------------------------------------------------------------------
