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/3afb0d69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3afb0d69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3afb0d69 Branch: refs/heads/tag-policy Commit: 3afb0d69e398bc0fde628a6e81310bbfde4888d1 Parents: 2b34826 e2a5900 Author: Madhan Neethiraj <[email protected]> Authored: Sat Jun 20 11:42:59 2015 -0400 Committer: Madhan Neethiraj <[email protected]> Committed: Sat Jun 20 11:42:59 2015 -0400 ---------------------------------------------------------------------- security-admin/scripts/db_setup.py | 12 ++- .../org/apache/ranger/biz/ServiceDBStore.java | 14 ++++ .../org/apache/ranger/common/db/BaseDao.java | 34 ++++++++ .../ranger/patch/PatchMigration_J10002.java | 28 ++++++- .../ranger/solr/SolrAccessAuditsService.java | 9 ++ .../src/main/webapp/WEB-INF/db_patch.log4j.xml | 87 ++++++++++++++++++++ .../apache/ranger/biz/TestServiceDBStore.java | 26 +++--- 7 files changed, 195 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3afb0d69/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3afb0d69/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java ----------------------------------------------------------------------
