Merge branch 'master' into tag-policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3a0582d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3a0582d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3a0582d8 Branch: refs/heads/tag-policy Commit: 3a0582d893cd5a2168f34e6d723e019ce628929e Parents: 4915b82 866c01a Author: Madhan Neethiraj <[email protected]> Authored: Wed Jun 3 08:38:05 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Wed Jun 3 08:38:05 2015 -0700 ---------------------------------------------------------------------- .../hbase/AuthorizationSession.java | 9 +- .../hbase/RangerAuthorizationCoprocessor.java | 47 +- .../RangerAuthorizationCoprocessorBase.java | 12 +- .../crypto/key/EncryptedPrivateKeyInfo.java | 128 ----- .../apache/hadoop/crypto/key/KeyProtector.java | 558 ------------------- .../hadoop/crypto/key/RangerKeyStore.java | 65 ++- 6 files changed, 108 insertions(+), 711 deletions(-) ----------------------------------------------------------------------
