You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/11/05 19:30:31 UTC
[43/44] git commit: Merge remote-tracking branch
'origin/gfac_appcatalog_int' into gfac_appcatalog_int
Merge remote-tracking branch 'origin/gfac_appcatalog_int' into gfac_appcatalog_int
Conflicts:
modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7b8d9844
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7b8d9844
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7b8d9844
Branch: refs/heads/gfac_appcatalog_int
Commit: 7b8d9844f72c81e2d16fb961a60876e9dbeea82d
Parents: fa666b3 e9ee22b
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Wed Nov 5 13:27:45 2014 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Nov 5 13:27:45 2014 -0500
----------------------------------------------------------------------
.../airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8d9844/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
----------------------------------------------------------------------