airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject [2/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Tue, 29 Jul 2014 21:24:57 GMT
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/5398ba79
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5398ba79
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5398ba79

Branch: refs/heads/master
Commit: 5398ba79b14d3e26ae0e9ce2913030ed2cd03b12
Parents: 3bf8e23 aef99c0
Author: raminder <raminder@apache.org>
Authored: Tue Jul 29 17:23:28 2014 -0400
Committer: raminder <raminder@apache.org>
Committed: Tue Jul 29 17:23:28 2014 -0400

----------------------------------------------------------------------
 .../client/samples/CreateLaunchExperiment.java  |   4 +-
 .../client/tools/DocumentCreatorNew.java        |   2 +-
 .../airavata/common/utils/ServerSettings.java   |   4 +
 .../server/src/main/resources/PBSTemplate.xslt  |   5 +
 .../main/resources/airavata-server.properties   |   2 +-
 .../server/src/main/resources/zoo.cfg           |   5 +
 .../credential/impl/ssh/SSHCredential.java      |   2 +
 .../server/src/main/assembly/bin-assembly.xml   |   1 +
 .../airavata/gfac/server/GfacServerHandler.java |  75 ++-
 .../gfac/gsissh/util/GFACGSISSHUtils.java       |   4 +-
 .../gfac/ssh/provider/impl/SSHProvider.java     |   2 +-
 .../gfac/ssh/security/TokenizedSSHAuthInfo.java |  12 +-
 .../airavata/gfac/ssh/util/GFACSSHUtils.java    |   4 +-
 .../gfac/services/impl/CredentialStoreTest.java |  36 +-
 modules/gfac/pom.xml                            |   1 +
 .../integration-tests/tomcat-distribution.iml   | 656 -------------------
 modules/server/pom.xml                          |   7 +-
 .../org/apache/airavata/server/ServerMain.java  |  91 ++-
 .../gsi/ssh/api/job/PBSOutputParser.java        |   4 +-
 .../gsi/ssh/api/job/SlurmOutputParser.java      |   2 +-
 20 files changed, 183 insertions(+), 736 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/5398ba79/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
----------------------------------------------------------------------


Mime
View raw message