Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/71e5f6b9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/71e5f6b9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/71e5f6b9 Branch: refs/heads/1.6 Commit: 71e5f6b97a3420d591ee801568dec26bcf1be13f Parents: f55d0bf 9aca7d7 Author: Eric C. Newton <[email protected]> Authored: Fri Oct 10 18:54:51 2014 -0400 Committer: Eric C. Newton <[email protected]> Committed: Fri Oct 10 18:54:51 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/security/Authorizations.java | 1 - .../apache/accumulo/core/util/shell/commands/ConfigCommand.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
