Merge branch 'master' into StoreGFacsJobCount
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d1d8759f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d1d8759f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d1d8759f Branch: refs/heads/master Commit: d1d8759fd81de460752bfebf845e8293c3b3b04c Parents: 9c23aa8 2207ece Author: shamrath <[email protected]> Authored: Fri Sep 12 17:25:33 2014 -0400 Committer: shamrath <[email protected]> Committed: Fri Sep 12 17:25:33 2014 -0400 ---------------------------------------------------------------------- modules/configuration/server/src/main/resources/PBSTemplate.xslt | 2 +- modules/configuration/server/src/main/resources/SLURMTemplate.xslt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
