This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 0604b682c37c2e33ec1094599b5e3b1b4c7824a1 Merge: 5359d94 9e32263 Author: Christopher Tubbs <[email protected]> AuthorDate: Thu Jun 20 02:49:27 2019 -0400 Merge branch '2.0' .../apache/accumulo/server/init/Initialize.java | 4 ++-- .../server/security/AuditedSecurityOperation.java | 9 ++------ .../server/security/SecurityOperation.java | 26 ++++++++++------------ .../server/security/handler/Authenticator.java | 2 +- .../server/security/handler/Authorizor.java | 2 +- .../security/handler/KerberosAuthenticator.java | 4 ++-- .../security/handler/KerberosAuthorizor.java | 4 ++-- .../handler/KerberosPermissionHandler.java | 4 ++-- .../server/security/handler/PermissionHandler.java | 2 +- .../server/security/handler/ZKAuthenticator.java | 9 +------- .../server/security/handler/ZKAuthorizor.java | 9 +------- .../server/security/handler/ZKPermHandler.java | 9 +------- .../replication/MasterReplicationCoordinator.java | 3 ++- 13 files changed, 30 insertions(+), 57 deletions(-)
