Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f49ff05 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f49ff05 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f49ff05 Branch: refs/heads/master Commit: 1f49ff05ac25b4e4ac4cbbd096d9feba2d4e8ae8 Parents: 6c941e1 6742627 Author: Sean Busbey <bus...@cloudera.com> Authored: Fri Apr 25 10:32:38 2014 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Fri Apr 25 10:32:38 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/security/Credentials.java | 9 +++++++ .../accumulo/core/security/CredentialsTest.java | 8 ++++++ .../server/client/ClientServiceHandler.java | 8 +++--- .../server/security/SecurityOperation.java | 28 ++++++-------------- 4 files changed, 28 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f49ff05/core/src/main/java/org/apache/accumulo/core/security/Credentials.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f49ff05/core/src/test/java/org/apache/accumulo/core/security/CredentialsTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f49ff05/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java ----------------------------------------------------------------------
