airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [24/50] [abbrv] airavata git commit: Merge remote-tracking branch 'origin/gfac_appcatalog_int' into gfac_appcatalog_int
Date Tue, 11 Nov 2014 20:12:28 GMT
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/master
Commit: 7b8d9844f72c81e2d16fb961a60876e9dbeea82d
Parents: fa666b3 e9ee22b
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Wed Nov 5 13:27:45 2014 -0500
Committer: Chathuri Wimalasena <kamalasini@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
----------------------------------------------------------------------


Mime
View raw message