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/8a7913fa Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8a7913fa Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8a7913fa Branch: refs/heads/master Commit: 8a7913fad430e52f11461ed6e9a1795f1d072546 Parents: 1742c49 2dde0d3 Author: raminder <[email protected]> Authored: Wed Apr 15 12:43:12 2015 -0400 Committer: raminder <[email protected]> Committed: Wed Apr 15 12:43:12 2015 -0400 ---------------------------------------------------------------------- .../apache/airavata/gfac/server/GfacServer.java | 2 ++ .../airavata/gfac/server/GfacServerHandler.java | 5 +++-- .../gfac/core/utils/GFacThreadPoolExecutor.java | 3 ++- .../gfac/monitor/email/EmailBasedMonitor.java | 16 +++++++++----- .../monitor/email/parser/PBSEmailParser.java | 22 ++++++++++++-------- .../monitor/email/parser/SLURMEmailParser.java | 14 ++++++------- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 8 +++---- 7 files changed, 42 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
