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/13c67c46 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/13c67c46 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/13c67c46 Branch: refs/heads/master Commit: 13c67c460409df04edba83704e6ee50bd51bffd3 Parents: 9b4dedf 4a0571d Author: Saminda Wijeratne <[email protected]> Authored: Wed Mar 12 10:24:32 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Wed Mar 12 10:24:32 2014 -0400 ---------------------------------------------------------------------- .../airavata/client/tools/DocumentCreator.java | 2 +- .../apache/airavata/job/monitor/MonitorID.java | 4 ++- .../monitor/impl/pull/qstat/QstatMonitor.java | 13 ++++++++- .../impl/pull/qstat/ResourceConnection.java | 8 ++++++ .../impl/push/amqp/UnRegisterThread.java | 3 +- .../src/main/resources/conf/log4j.properties | 2 +- .../gfac/provider/impl/GSISSHProvider.java | 4 ++- .../registry/jpa/impl/AiravataJPARegistry.java | 5 ++-- .../registry/jpa/impl/ExperimentRegistry.java | 20 ++++++++------ .../jpa/resources/ErrorDetailResource.java | 1 + .../apache/airavata/gsi/ssh/api/Cluster.java | 6 ++++ .../gsi/ssh/api/job/PBSOutputParser.java | 29 ++++++++++++++++---- .../gsi/ssh/api/job/SlurmOutputParser.java | 6 ++-- .../gsi/ssh/impl/GSISSHAbstractCluster.java | 5 +++- 14 files changed, 81 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
