Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata into mongo-registry
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/82176304 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/82176304 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/82176304 Branch: refs/heads/mongo-registry Commit: 82176304ab68382241d76fa0964b7eacae274937 Parents: 801489b 5002df5 Author: Supun Nakandala <[email protected]> Authored: Thu May 28 19:44:32 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Thu May 28 19:44:32 2015 +0530 ---------------------------------------------------------------------- .../main/resources/airavata-server.properties | 1 + .../messaging/core/MessagingConstants.java | 2 +- .../core/impl/RabbitMQProcessConsumer.java | 6 +- .../core/impl/RabbitMQStatusConsumer.java | 5 +- .../core/impl/RabbitMQTaskLaunchConsumer.java | 6 +- .../validator/impl/BatchQueueValidator.java | 83 ++++++++++++++------ .../gsi/ssh/api/job/PBSOutputParser.java | 2 +- .../gsi/ssh/api/job/UGEOutputParser.java | 3 + 8 files changed, 77 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/82176304/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/82176304/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java ----------------------------------------------------------------------
