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/98f21864 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/98f21864 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/98f21864 Branch: refs/heads/master Commit: 98f218642b53d49223bb2ccce740902839053cdb Parents: 5e7d3ef 73c8337 Author: Lahiru Gunathilake <[email protected]> Authored: Wed Apr 15 10:00:40 2015 -0400 Committer: Lahiru Gunathilake <[email protected]> Committed: Wed Apr 15 10:00:40 2015 -0400 ---------------------------------------------------------------------- .../airavata/gfac/server/GfacServerHandler.java | 2 +- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 45 +++++++++++--------- .../core/impl/RabbitMQTaskLaunchConsumer.java | 2 +- .../core/impl/RabbitMQTaskLaunchPublisher.java | 11 +---- .../core/impl/GFACPassiveJobSubmitter.java | 6 ++- 5 files changed, 33 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/98f21864/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ----------------------------------------------------------------------
