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 CFE0611E48 for ; Tue, 23 Sep 2014 18:33:50 +0000 (UTC) Received: (qmail 10312 invoked by uid 500); 23 Sep 2014 18:33:50 -0000 Delivered-To: apmail-argus-commits-archive@argus.apache.org Received: (qmail 10294 invoked by uid 500); 23 Sep 2014 18:33:50 -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 10280 invoked by uid 99); 23 Sep 2014 18:33:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2014 18:33:50 +0000 X-ASF-Spam-Status: No, hits=-2000.8 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; Tue, 23 Sep 2014 18:33:49 +0000 Received: (qmail 7889 invoked by uid 99); 23 Sep 2014 18:33:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2014 18:33:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A42AA937DE9; Tue, 23 Sep 2014 18:33:28 +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: Tue, 23 Sep 2014 18:33:30 -0000 Message-Id: In-Reply-To: <10b81161b51b498bb5948826d013726f@git.apache.org> References: <10b81161b51b498bb5948826d013726f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] 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/7201bf87 Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/7201bf87 Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/7201bf87 Branch: refs/heads/master Commit: 7201bf87c8001cfd8657a298faf2809b0a0a5028 Parents: ea4df43 6c11ec2 Author: mneethiraj Authored: Tue Sep 23 10:00:42 2014 -0700 Committer: mneethiraj Committed: Tue Sep 23 10:00:42 2014 -0700 ---------------------------------------------------------------------- security-admin/scripts/install.sh | 4 ++-- security-admin/src/main/webapp/login.jsp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------