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/5fb684b6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5fb684b6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5fb684b6 Branch: refs/heads/master Commit: 5fb684b621202489eb62829569651bad41268853 Parents: 8a615ec 47afa39 Author: raminder <[email protected]> Authored: Mon Mar 3 14:07:48 2014 -0500 Committer: raminder <[email protected]> Committed: Mon Mar 3 14:07:48 2014 -0500 ---------------------------------------------------------------------- .../monitor/impl/pull/qstat/QstatMonitor.java | 26 +++++++++++--------- .../impl/pull/qstat/ResourceConnection.java | 2 ++ .../apache/airavata/gfac/utils/GFacUtils.java | 7 +----- .../client/OrchestratorClientFactoryTest.java | 3 ++- .../registry/jpa/impl/ExperimentRegistry.java | 6 ++--- 5 files changed, 23 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5fb684b6/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GFacUtils.java ----------------------------------------------------------------------
