You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/04/30 16:00:16 UTC

[2/2] airavata git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7c1c632b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7c1c632b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7c1c632b

Branch: refs/heads/master
Commit: 7c1c632b83fc52659267a1e0772f263df836d492
Parents: 2f06d27 6c06aaa
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Apr 30 10:00:13 2015 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Apr 30 10:00:13 2015 -0400

----------------------------------------------------------------------
 .../client/samples/CreateLaunchExperiment.java  |   8 +-
 .../airavata/gfac/server/GfacServerHandler.java |  18 +-
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  | 208 +++++++++++--------
 .../core/monitor/GfacInternalStatusUpdator.java |   2 +-
 .../gfac/core/utils/OutHandlerWorker.java       |   1 +
 .../server/OrchestratorServerHandler.java       |   6 +-
 .../util/OrchestratorRecoveryHandler.java       |   2 +-
 .../core/impl/GFACEmbeddedJobSubmitter.java     |  13 +-
 .../core/impl/GFACPassiveJobSubmitter.java      |  33 ++-
 .../engine/concurrent/PredicatedTaskRunner.java |   2 -
 10 files changed, 163 insertions(+), 130 deletions(-)
----------------------------------------------------------------------