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 2014/03/12 19:29:37 UTC

[8/8] 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/e8a6d419
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e8a6d419
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e8a6d419

Branch: refs/heads/master
Commit: e8a6d419a9ce74052a161bbe1d97fe74f4be8da5
Parents: c4bac75 8c6f9b5
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Mar 12 14:29:26 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Mar 12 14:29:26 2014 -0400

----------------------------------------------------------------------
 .../job/monitor/AiravataJobStatusUpdator.java   | 24 ++++++++------
 .../client/OrchestratorClientFactoryTest.java   |  2 +-
 .../client/sample/OrchestratorClientSample.java |  2 +-
 .../orchestrator/core/BaseOrchestratorTest.java |  2 +-
 .../registry/jpa/impl/ExperimentRegistry.java   | 33 ++++++++++----------
 .../registry/jpa/impl/RegistryImpl.java         |  4 +--
 6 files changed, 35 insertions(+), 32 deletions(-)
----------------------------------------------------------------------