Return-Path: X-Original-To: apmail-argus-commits-archive@minotaur.apache.org Delivered-To: apmail-argus-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4370111A88 for ; Fri, 22 Aug 2014 07:20:29 +0000 (UTC) Received: (qmail 41250 invoked by uid 500); 22 Aug 2014 07:20:29 -0000 Delivered-To: apmail-argus-commits-archive@argus.apache.org Received: (qmail 41232 invoked by uid 500); 22 Aug 2014 07:20:29 -0000 Mailing-List: contact commits-help@argus.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@argus.incubator.apache.org Delivered-To: mailing list commits@argus.incubator.apache.org Received: (qmail 41223 invoked by uid 99); 22 Aug 2014 07:20:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2014 07:20:29 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 22 Aug 2014 07:20:06 +0000 Received: (qmail 37679 invoked by uid 99); 22 Aug 2014 07:20:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2014 07:20:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 909559C78B1; Fri, 22 Aug 2014 07:20:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@argus.incubator.apache.org Date: Fri, 22 Aug 2014 07:20:06 -0000 Message-Id: <0e3f094c39774a37ad218dd0ccd0a916@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus X-Virus-Checked: Checked by ClamAV on apache.org 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/e3672200 Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/e3672200 Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/e3672200 Branch: refs/heads/master Commit: e36722006e36702db9c39ee83e521e556853da92 Parents: 7724558 9525189 Author: mneethiraj Authored: Fri Aug 22 00:17:16 2014 -0700 Committer: mneethiraj Committed: Fri Aug 22 00:17:16 2014 -0700 ---------------------------------------------------------------------- .../main/java/com/xasecure/biz/AssetMgr.java | 22 ++++++++++ .../com/xasecure/service/XPolicyService.java | 5 --- .../webapp/scripts/views/common/AddGroup.js | 2 + .../webapp/scripts/views/users/UserCreate.js | 2 +- .../main/webapp/scripts/views/users/UserForm.js | 45 +++++++++++++------- 5 files changed, 54 insertions(+), 22 deletions(-) ----------------------------------------------------------------------