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/2c37c451 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2c37c451 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2c37c451 Branch: refs/heads/master Commit: 2c37c4517a4d967a0f3da94fed19aee9ae029d03 Parents: ce8a568 c41900e Author: Mike Drob <md...@cloudera.com> Authored: Fri Dec 27 16:51:47 2013 -0800 Committer: Mike Drob <md...@cloudera.com> Committed: Fri Dec 27 16:51:47 2013 -0800 ---------------------------------------------------------------------- .../core/security/AuthorizationContainer.java | 8 +- .../accumulo/core/security/Authorizations.java | 75 ++++++++++++++--- .../core/security/ColumnVisibility.java | 89 ++++++++++++++------ .../accumulo/core/security/Credentials.java | 26 ++++++ .../core/security/NamespacePermission.java | 25 +++++- .../core/security/SystemPermission.java | 25 +++++- .../accumulo/core/security/TablePermission.java | 25 +++++- .../core/security/VisibilityConstraint.java | 9 ++ .../core/security/VisibilityEvaluator.java | 41 ++++++++- .../core/security/VisibilityParseException.java | 12 ++- 10 files changed, 287 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
