Merge branch 'airavata-0.15-release-branch' of https://git-wip-us.apache.org/repos/asf/airavata into airavata-0.15-release-branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c3a8b77d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c3a8b77d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c3a8b77d Branch: refs/heads/airavata-0.15-release-branch Commit: c3a8b77d6b47fd3723dd88acd82357a59dc9fe45 Parents: 815a268 4133c5b Author: Shameera Rathanyaka <[email protected]> Authored: Wed Jun 10 10:19:15 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Wed Jun 10 10:19:15 2015 -0400 ---------------------------------------------------------------------- .../application/catalog/data/util/AppCatalogJPAUtils.java | 5 +++-- .../org/apache/airavata/gfac/core/utils/GFacUtils.java | 3 ++- .../messaging/core/impl/RabbitMQTaskLaunchConsumer.java | 10 ++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
