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/96f04f4d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/96f04f4d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/96f04f4d Branch: refs/heads/master Commit: 96f04f4d225ee1eb4e88ec6714933083ff80d94d Parents: c1c85bb 264bbeb Author: shamrath <[email protected]> Authored: Fri Apr 24 16:27:37 2015 -0400 Committer: shamrath <[email protected]> Committed: Fri Apr 24 16:27:37 2015 -0400 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 14 ++++++------ .../tools/RegisterSampleApplications.java | 11 +++++---- .../airavata/common/utils/AiravataZKUtils.java | 20 ++++++++-------- .../apache/airavata/gfac/server/GfacServer.java | 2 +- .../airavata/gfac/server/GfacServerHandler.java | 8 ++----- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 4 ++-- .../gfac/core/utils/GFacThreadPoolExecutor.java | 2 +- .../airavata/gfac/core/utils/GFacUtils.java | 24 ++++++-------------- .../gfac/monitor/email/EmailBasedMonitor.java | 8 +------ .../monitor/impl/pull/qstat/HPCPullMonitor.java | 8 +++---- 10 files changed, 41 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/96f04f4d/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java ----------------------------------------------------------------------
