Merge remote-tracking branch 'origin/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/3fd5fa96 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fd5fa96 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3fd5fa96 Branch: refs/heads/master Commit: 3fd5fa9673bfddb83ac3328728fa0ba666bcbfa9 Parents: e9fe022 b33fbf4 Author: John Vines <vi...@apache.org> Authored: Mon Feb 3 18:40:32 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Mon Feb 3 18:40:32 2014 -0500 ---------------------------------------------------------------------- .../core/client/ClientConfiguration.java | 25 ++++++-------------- .../client/admin/SecurityOperationsImpl.java | 4 ++++ .../server/client/ClientServiceHandler.java | 19 ++++++++------- .../accumulo/master/FateServiceHandler.java | 14 +++++------ .../master/MasterClientServiceHandler.java | 4 ++-- .../concurrent/ChangePermissions.java | 2 +- .../org/apache/accumulo/test/NamespacesIT.java | 12 ++-------- 7 files changed, 34 insertions(+), 46 deletions(-) ----------------------------------------------------------------------
