Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ranger
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/80e2eae0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/80e2eae0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/80e2eae0 Branch: refs/heads/master Commit: 80e2eae09f17166f869bc601ac293f8340a6dca8 Parents: 428ce97 634e8d4 Author: rmani <[email protected]> Authored: Thu Apr 14 11:36:15 2016 -0700 Committer: rmani <[email protected]> Committed: Thu Apr 14 11:36:15 2016 -0700 ---------------------------------------------------------------------- .../ranger/plugin/store/file/TagFileStore.java | 25 +++- kms/config/kms-webapp/dbks-site.xml | 31 +++++ kms/scripts/DBMK2HSM.sh | 19 +++ kms/scripts/HSMMK2DB.sh | 19 +++ kms/scripts/install.properties | 6 + kms/scripts/setup.sh | 64 ++++++++- .../apache/hadoop/crypto/key/DB2HSMMKUtil.java | 129 ++++++++++++++++++ .../apache/hadoop/crypto/key/HSM2DBMKUtil.java | 127 ++++++++++++++++++ .../org/apache/hadoop/crypto/key/RangerHSM.java | 131 +++++++++++++++++++ .../apache/hadoop/crypto/key/RangerKMSMKI.java | 25 ++++ .../crypto/key/RangerKeyStoreProvider.java | 18 ++- .../hadoop/crypto/key/RangerMasterKey.java | 40 +++++- .../java/org/apache/ranger/biz/TagDBStore.java | 23 +++- .../ranger/rest/ServiceTagsProcessor.java | 13 +- .../service/RangerServiceResourceService.java | 16 ++- .../scripts/views/policies/RangerPolicyForm.js | 3 +- src/main/assembly/kms.xml | 2 + 17 files changed, 661 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
