ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject [2/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus
Date Tue, 16 Sep 2014 20:58:28 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus


Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/852ec251
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/852ec251
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/852ec251

Branch: refs/heads/master
Commit: 852ec251628fa1b82ca863334c1d1301e8303d0b
Parents: 830c621 a4ec210
Author: mneethiraj <mneethiraj@hortonworks.com>
Authored: Tue Sep 16 09:17:29 2014 -0700
Committer: mneethiraj <mneethiraj@hortonworks.com>
Committed: Tue Sep 16 09:17:29 2014 -0700

----------------------------------------------------------------------
 .../main/java/com/xasecure/biz/AssetMgr.java    |  57 +++++++++++++++++--
 .../main/java/com/xasecure/rest/AssetREST.java  |  10 ++++
 .../main/java/com/xasecure/rest/PublicAPIs.java |  27 ++++++++-
 .../com/xasecure/service/XAssetService.java     |   6 ++
 .../com/xasecure/service/XPolicyService.java    |  15 ++++-
 .../xasecure/service/XRepositoryService.java    |  15 +++--
 .../com/xasecure/service/XResourceService.java  |   5 +-
 .../src/main/webapp/copyrightPluginList.html    |   2 +-
 security-admin/src/main/webapp/images/logo.png  | Bin 0 -> 4160 bytes
 security-admin/src/main/webapp/index.html       |   4 +-
 security-admin/src/main/webapp/login.jsp        |   4 +-
 .../scripts/modules/globalize/message/en.js     |   3 +-
 .../webapp/templates/common/Footer_tmpl.html    |   2 +-
 13 files changed, 128 insertions(+), 22 deletions(-)
----------------------------------------------------------------------



Mime
View raw message