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/06b626e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/06b626e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/06b626e5 Branch: refs/heads/master Commit: 06b626e5b5d87ef0e90c35c78012638047771fe8 Parents: 7db3519 c5427e1 Author: Josh Elser <els...@apache.org> Authored: Mon Dec 22 13:56:01 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Dec 22 13:56:01 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/security/SecurityUtil.java | 80 ------------------- .../accumulo/server/security/SecurityUtil.java | 83 ++++++++++++++++++++ 2 files changed, 83 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
