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/a4daa528 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a4daa528 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a4daa528 Branch: refs/heads/master Commit: a4daa528a647e528d3e7db6a7975c76806d26178 Parents: c5c83ea 4f95a79 Author: raminder <[email protected]> Authored: Mon Apr 13 17:08:49 2015 -0400 Committer: raminder <[email protected]> Committed: Mon Apr 13 17:08:49 2015 -0400 ---------------------------------------------------------------------- .../data/resources/EmailPropertyResource.java | 1 + .../airavata/common/utils/ServerSettings.java | 29 ++------------ .../main/resources/airavata-server.properties | 9 +---- .../gfac/monitor/email/EmailBasedMonitor.java | 18 ++++++--- .../gfac/monitor/email/EmailMonitorFactory.java | 18 +++++---- .../monitor/email/parser/PBSEmailParser.java | 42 -------------------- .../monitor/email/parser/SLURMEmailParser.java | 25 +----------- .../gfac/ssh/provider/impl/SSHProvider.java | 3 +- 8 files changed, 32 insertions(+), 113 deletions(-) ----------------------------------------------------------------------
