Merge branch '1.7'

Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf75edb4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf75edb4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf75edb4

Branch: refs/heads/master
Commit: cf75edb45e77694ffd6442bbc2934e20c0277c7c
Parents: 860ee35 e43e927
Author: Josh Elser <els...@apache.org>
Authored: Sat Feb 6 16:40:30 2016 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Sat Feb 6 16:40:30 2016 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/conf/Property.java |   5 +
 docs/src/main/asciidoc/chapters/kerberos.txt    |  52 ++--
 .../server/security/UserImpersonation.java      |  97 ++++++-
 ...redentialsUpdatingInvocationHandlerTest.java |  55 ++--
 .../server/security/UserImpersonationTest.java  | 259 ++++++++++++++++++-
 5 files changed, 422 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf75edb4/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

Reply via email to