Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7EEE6117E1 for ; Fri, 11 Jul 2014 22:21:16 +0000 (UTC) Received: (qmail 99519 invoked by uid 500); 11 Jul 2014 22:21:16 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 99416 invoked by uid 500); 11 Jul 2014 22:21:16 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 99284 invoked by uid 99); 11 Jul 2014 22:21:16 -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, 11 Jul 2014 22:21:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0E3878B708E; Fri, 11 Jul 2014 22:21:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samindaw@apache.org To: commits@airavata.apache.org Date: Fri, 11 Jul 2014 22:21:33 -0000 Message-Id: <54a10f2c39444bbcb78644fef082e9cb@git.apache.org> In-Reply-To: <76433eb95bf24e26969451d198111057@git.apache.org> References: <76433eb95bf24e26969451d198111057@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/20] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/feb30440 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/feb30440 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/feb30440 Branch: refs/heads/master Commit: feb30440068ea9f2ea3030c6ac9006412c8772eb Parents: 3e6c815 eed477b Author: Saminda Wijeratne Authored: Fri Jul 11 18:20:47 2014 -0400 Committer: Saminda Wijeratne Committed: Fri Jul 11 18:20:47 2014 -0400 ---------------------------------------------------------------------- .../server/src/main/resources/PBSTemplate.xslt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------