airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Mon, 10 Mar 2014 19:15:41 GMT
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/1a86ed90
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1a86ed90
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1a86ed90

Branch: refs/heads/master
Commit: 1a86ed90724cbea1a5b42007a09faf9bc33bab6e
Parents: 7124930 24babee
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Mon Mar 10 15:15:26 2014 -0400
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Mon Mar 10 15:15:26 2014 -0400

----------------------------------------------------------------------
 .../client/samples/CreateLaunchExperiment.java  | 23 +++---
 .../airavata/client/tools/DocumentCreator.java  |  1 +
 .../job/monitor/AiravataJobStatusUpdator.java   |  2 +-
 .../apache/airavata/job/monitor/MonitorID.java  | 25 ++++++
 .../airavata/job/monitor/MonitorManager.java    | 85 ++++++++++++-------
 .../airavata/job/monitor/core/Monitor.java      |  3 +-
 .../job/monitor/event/MonitorPublisher.java     |  1 +
 .../monitor/impl/pull/qstat/QstatMonitor.java   | 24 ++----
 .../job/monitor/impl/push/amqp/AMQPMonitor.java | 50 ++++++++---
 .../airavata/job/monitor/state/JobStatus.java   | 17 +---
 .../airavata/job/monitor/AMQPMonitorTest.java   |  3 +-
 .../airavata/job/monitor/QstatMonitorTest.java  |  2 +-
 .../src/test/resources/monitor.properties       |  1 +
 .../main/resources/schemas/HostDescription.xsd  |  1 +
 .../apache/airavata/common/utils/Constants.java |  2 +
 .../resources/conf/airavata-server.properties   |  5 +-
 .../server/OrchestratorServerHandler.java       | 87 +++++++++-----------
 17 files changed, 192 insertions(+), 140 deletions(-)
----------------------------------------------------------------------



Mime
View raw message