Fixed compilation error introduce with previous merge
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bfdd8636
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bfdd8636
Diff:
Implemented Orchestrator side improvements of AIRAVATA-1426
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9a138b54
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9a138b54
Diff:
Merge branch 'master' into orchestratorJobCountImprovment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/459b7cbf
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/459b7cbf
Diff:
Removed .java part from job count validator
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d899c1c3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d899c1c3
Diff:
Resolve Merge confilicts and Merge master branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b44433c9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b44433c9
Diff:
Merge branch 'master' into orchestratorJobCountImprovment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9eddff96
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9eddff96
Diff:
Added global max job count propety to airavata-server.properties file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ba4b4dd8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ba4b4dd8
Diff:
Renamed enable.job.restriction.validation property name to enable.max.job.count
removed jobcountvalidator class from validator list
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3cfc7114
Tree:
http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/GSISecurityContext.java
--
diff --git
Added job count validation enable/disable capability
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a78137b7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a78137b7
Diff:
Get max job count from compute resource description of particular resource
instead of global max value
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8bc79959
Tree:
Repository: airavata
Updated Branches:
refs/heads/orchestratorJobThrottleFeature [created] eed05a434
http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMICGSSCredentials.java
Moved job restriction check logic to SimpleOrchestratorImpl
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b8cacbc3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b8cacbc3
Diff:
Merge branch 'master' into orchestratorJobThrottleFeature
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4070d5b2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4070d5b2
Diff:
Repository: airavata
Updated Branches:
refs/heads/orchestratorJobThrottleFeature eed05a434 - 4070d5b25
updated pom to use jglobus 2.1.0 and added bes related handlers
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit:
Repository: airavata
Updated Branches:
refs/heads/orchestratorJobThrottleFeature 4070d5b25 - b2f260e10
updated bes and gram code
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2b73d478
Tree:
Repository: airavata
Updated Branches:
refs/heads/master 2b73d478b - 45e0185cc
stdout/error was not avaiable so retry 3 times. AIRAVATA-1449
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7c803ce7
Tree:
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/45e0185c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/45e0185c
Diff:
removing recursively calling publish
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/255dd9e3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/255dd9e3
Diff:
http://git-wip-us.apache.org/repos/asf/airavata/blob/255dd9e3/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentity.java
--
diff --git
20 matches
Mail list logo