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/e5901e8e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e5901e8e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e5901e8e Branch: refs/heads/master Commit: e5901e8e8fb08e909475997d32b60ba33fec5b01 Parents: 2a813b8 67195e5 Author: Saminda Wijeratne <[email protected]> Authored: Mon Mar 10 22:22:24 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Mon Mar 10 22:22:24 2014 -0400 ---------------------------------------------------------------------- .../airavata/job/monitor/core/PushMonitor.java | 8 +++++++ .../job/monitor/impl/push/amqp/AMQPMonitor.java | 22 +++++++++++++++++--- .../monitor/impl/push/amqp/BasicConsumer.java | 5 ++++- .../job/monitor/util/AMQPConnectionUtil.java | 6 ++---- .../airavata/job/monitor/util/X509Helper.java | 3 ++- .../registry/jpa/resources/Utils.java | 1 + .../jpa/utils/ThriftDataModelConversion.java | 1 + pom.xml | 2 +- 8 files changed, 38 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
